diff options
205 files changed, 8067 insertions, 6931 deletions
diff --git a/.gitignore b/.gitignore index ae327080a..630e50839 100644 --- a/.gitignore +++ b/.gitignore @@ -73,6 +73,7 @@ docbook-text-style.xsl **/test/interactive-helper/mthdcat **/test/interactive-helper/test_fileutl **/test/interactive-helper/test_udevcdrom +**/test/interactive-helper/aptdropprivs **/test/libapt/libapt_test # Documentation @@ -107,6 +108,8 @@ Makefile /debian/libapt-pkg-dev/ /debian/libapt-pkg-doc/ /debian/apt-transport-https/ +# Copyright file copied from COPYING +/debian/copyright # generated for and by abicheck /abicheck/apt_build.xml diff --git a/.travis.yml b/.travis.yml index 192573e7d..7ef7b36c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,30 +1,20 @@ language: cpp cache: ccache sudo: required -dist: trusty -before_install: - - sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ wily main universe' -y - - sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial main' -y - - | - sudo sh -c '/bin/echo -e "Package: *\nPin: release n=wily\nPin-Priority: 1" > /etc/apt/preferences.d/wily' - sudo sh -c '/bin/echo -e "Package: *\nPin: release n=xenial\nPin-Priority: 1" > /etc/apt/preferences.d/xenial' - - sudo apt-get update -qq +services: + - docker +env: + - USER=travis CMAKE_FLAGS= + - USER=root CMAKE_FLAGS=-DWITH_DOC=OFF install: - - sudo apt-get -qq -y -t wily install gettext liblz4-dev python3-apt - - sudo apt-get -qq -y -t xenial install cmake ninja-build - - sudo ./prepare-release travis-ci + - sed -i -e "s#1000#$(id -u)#g" Dockerfile + - docker build --tag=apt-ci . before_script: - - ( mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Coverage -G Ninja .. ) - - ninja -C build + - docker run --rm -w $PWD -v $HOME/.ccache:$HOME/.ccache -v $PWD:$PWD --user=travis apt-ci sh -e -c "mkdir build && cd build && env PATH=/usr/lib/ccache:\$PATH cmake -DCMAKE_BUILD_TYPE=Coverage -G Ninja $CMAKE_FLAGS .." + - docker run --rm -w $PWD -v $HOME/.ccache:$HOME/.ccache -v $PWD:$PWD --user=travis apt-ci ninja -C build script: - - CTEST_OUTPUT_ON_FAILURE=1 ninja -C build test - - DESTDIR=$PWD/rootdir chronic ninja -C build install - - ./test/integration/run-tests -qq - - sudo adduser --force-badname --system --home /nonexistent --no-create-home --quiet _apt || true - - sudo chmod go+x /home/travis - - sudo chmod -R go+rwX /home/travis/build - - sudo ./test/integration/run-tests -qq + - docker run --rm -w $PWD -v $PWD:$PWD --user=travis apt-ci env CTEST_OUTPUT_ON_FAILURE=1 ninja -C build test + - docker run --rm -w $PWD -v $PWD:$PWD --user=travis apt-ci env DESTDIR=$PWD/rootdir chronic ninja -C build install + - docker run --rm -w $PWD -v $PWD:$PWD --user=$USER --tmpfs /tmp:suid,exec apt-ci unbuffer ./test/integration/run-tests -qq -j 4 after_script: - - cd build - - gcov -r $(find -name '*.gcno') - - bash <(curl -s https://codecov.io/bash) + - docker run --rm -w $PWD/build -v $PWD:$PWD --user=$USER `bash <(curl -s https://codecov.io/env)` apt-ci bash -c 'bash <(curl -s https://codecov.io/bash)' diff --git a/CMake/Misc.cmake b/CMake/Misc.cmake index 18b51841f..72bd61f14 100644 --- a/CMake/Misc.cmake +++ b/CMake/Misc.cmake @@ -45,7 +45,7 @@ function(add_vendor_file) VERBATIM ) - # Woud like to use ${AVF_OUTPUT} as target name, but then ninja gets + # Would like to use ${AVF_OUTPUT} as target name, but then ninja gets # cycles. add_custom_target(vendor-${AVF_OUTPUT} ALL DEPENDS ${out}) endfunction() diff --git a/CMake/config.h.in b/CMake/config.h.in index 6f39e2f58..7b068864c 100644 --- a/CMake/config.h.in +++ b/CMake/config.h.in @@ -63,6 +63,7 @@ #cmakedefine CONF_DIR "${CONF_DIR}" #cmakedefine LIBEXEC_DIR "${LIBEXEC_DIR}" #cmakedefine BIN_DIR "${BIN_DIR}" +#cmakedefine DPKG_DATADIR "${DPKG_DATADIR}" /* Group of the root user */ #cmakedefine ROOT_GROUP "${ROOT_GROUP}" diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ff18eb83..3d257ceb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,8 @@ find_package(Threads) find_package(LFS REQUIRED) find_package(Iconv REQUIRED) +find_package(Perl REQUIRED) + if(USE_NLS) find_package(Intl REQUIRED) link_libraries(${Intl_LIBRARIES}) @@ -116,7 +118,7 @@ endif() check_function_exists(statvfs HAVE_STATVFS) if (NOT HAVE_STATVFS) - configure_file(CMake/statvfs.h.in ${PROJECT_BINARY_DIR}/include/statvfs.h COPYONLY) + configure_file(CMake/statvfs.h.in ${PROJECT_BINARY_DIR}/include/sys/statvfs.h COPYONLY) endif() CHECK_STRUCT_HAS_MEMBER("struct statfs" f_type sys/vfs.h HAVE_STRUCT_STATFS_F_TYPE) @@ -173,8 +175,14 @@ endif() # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>") -set(PACKAGE_VERSION "1.4~beta1") +set(PACKAGE_VERSION "1.4.8") +if (NOT DEFINED DPKG_DATADIR) + execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;" + OUTPUT_VARIABLE DPKG_DATADIR_CMD OUTPUT_STRIP_TRAILING_WHITESPACE) + message(STATUS "Found dpkg data dir: ${DPKG_DATADIR_CMD}") + set(DPKG_DATADIR "${DPKG_DATADIR_CMD}" CACHE PATH "dpkg data directory") +endif() if (NOT DEFINED COMMON_ARCH) execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH OUTPUT_VARIABLE COMMON_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/COPYING.GPL b/COPYING.GPL index 60549be51..d159169d1 100644 --- a/COPYING.GPL +++ b/COPYING.GPL @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> + Copyright (C) <year> <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..b59a5dc6d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +FROM debian:stretch +COPY . /tmp +WORKDIR /tmp +RUN sed -i s#://deb.debian.org#://cdn-fastly.deb.debian.org# /etc/apt/sources.list \ + && apt-get update \ + && adduser --home /home/travis travis --quiet --disabled-login --gecos "" --uid 1000 \ + && env DEBIAN_FRONTEND=noninteractive apt-get install build-essential ccache ninja-build expect curl git -q -y \ + && env DEBIAN_FRONTEND=noninteractive ./prepare-release travis-ci \ + && dpkg-reconfigure ccache \ + && rm -r /tmp/* \ + && apt-get clean diff --git a/README.progress-reporting b/README.progress-reporting index 5d9b581c5..134ed5334 100644 --- a/README.progress-reporting +++ b/README.progress-reporting @@ -23,7 +23,7 @@ pmstatus:pkgname:TotalPercentage:action-description PkgName = the name of the package TotalPercentage = the total progress between [0..100] -description = a i18ned human readable decription of the current action +description = a i18ned human readable description of the current action Example: @@ -61,9 +61,9 @@ dlstatus:AlreadDownloaded:TotalPercentage:action-description AlreadyDownloaded = the number of already downloaded packages TotalPercentage = the total progress between [0..100] -description = a i18ned human readable decription of the current action +description = a i18ned human readable description of the current action Example: dlstatus:1:9.05654:Downloading file 1 of 3 (4m40s remaining) dlstatus:1:9.46357:Downloading file 1 of 3 (4m39s remaining) -dlstatus:1:9.61022:Downloading file 1 of 3 (4m38s remaining)
\ No newline at end of file +dlstatus:1:9.61022:Downloading file 1 of 3 (4m38s remaining) diff --git a/apt-inst/CMakeLists.txt b/apt-inst/CMakeLists.txt index f7578231a..31da115e4 100644 --- a/apt-inst/CMakeLists.txt +++ b/apt-inst/CMakeLists.txt @@ -6,7 +6,9 @@ set(MAJOR 2.0) set(MINOR 0) set(APT_INST_MAJOR ${MAJOR} PARENT_SCOPE) -# Definition of the C++ files used to build the library +# Definition of the C++ files used to build the library - note that this +# is expanded at CMake time, so you have to rerun cmake if you add or remove +# a file (you can just run cmake . in the build directory) file(GLOB_RECURSE library "*.cc") file(GLOB_RECURSE headers "*.h") diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc index 5d42adf87..f50c23e46 100644 --- a/apt-inst/extract.cc +++ b/apt-inst/extract.cc @@ -37,7 +37,7 @@ is invoked. As we unpack we record the file list differences in the FL cache. If - we need to unroll the the FL cache knows which files have been unpacked + we need to unroll the FL cache knows which files have been unpacked and can undo. When we need to erase then it knows which files have not been unpacked. diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc index a55416d6b..6251b79b5 100644 --- a/apt-inst/filelist.cc +++ b/apt-inst/filelist.cc @@ -195,7 +195,7 @@ map_ptrloc pkgFLCache::TreeLookup(map_ptrloc *Base,const char *Text, /*}}}*/ // FLCache::PrintTree - Print out a tree /*{{{*/ // --------------------------------------------------------------------- -/* This is a simple generic tree dumper, ment for debugging. */ +/* This is a simple generic tree dumper, meant for debugging. */ void pkgFLCache::PrintTree(map_ptrloc Base,unsigned long Size) { if (Base == 0) diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h index 8c4891bcf..5d5327f6c 100644 --- a/apt-inst/filelist.h +++ b/apt-inst/filelist.h @@ -12,7 +12,7 @@ The storage content of the class is maintained in a memory map and is written directly to the file system. Performance is traded against space to give something that performs well and remains small. - The average per file usage is 32 bytes which yeilds about a meg every + The average per file usage is 32 bytes which yields about a meg every 36k files. Directory paths are collected into a binary tree and stored only once, this offsets the cost of the hash nodes enough to keep memory usage slightly less than the sum of the filenames. diff --git a/apt-pkg/CMakeLists.txt b/apt-pkg/CMakeLists.txt index 3620b66e9..8d7fcd9e6 100644 --- a/apt-pkg/CMakeLists.txt +++ b/apt-pkg/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories(${PROJECT_BINARY_DIR}/include/apt-pkg) add_definitions("-DAPT_PKG_EXPOSE_STRING_VIEW") file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include/apt-pkg/) -execute_process(COMMAND ${PROJECT_SOURCE_DIR}/triehash/triehash.pl +execute_process(COMMAND ${PERL_EXECUTABLE} ${PROJECT_SOURCE_DIR}/triehash/triehash.pl --ignore-case --header ${PROJECT_BINARY_DIR}/include/apt-pkg/tagfile-keys.h --code ${CMAKE_CURRENT_BINARY_DIR}/tagfile-keys.cc @@ -29,7 +29,9 @@ execute_process(COMMAND grep "^#define APT_PKG_RELEASE" message(STATUS "Building libapt-pkg ${MAJOR} (release ${MINOR})") set(APT_PKG_MAJOR ${MAJOR} PARENT_SCOPE) # exporting for methods/CMakeLists.txt -# Definition of the C++ files used to build the library +# Definition of the C++ files used to build the library - note that this +# is expanded at CMake time, so you have to rerun cmake if you add or remove +# a file (you can just run cmake . in the build directory) file(GLOB_RECURSE library "*.cc" "${CMAKE_CURRENT_BINARY_DIR}/tagfile-keys.cc") file(GLOB_RECURSE headers "*.h") diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 82bf8a1eb..231c5eed9 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1913,7 +1913,7 @@ void pkgAcqMetaSig::Done(string const &Message, HashStringList const &Hashes, { auto const Releasegpg = GetFinalFilename(); auto const Release = MetaIndex->GetFinalFilename(); - // if this is an IMS-Hit on Release ensure we also have the the Release.gpg file stored + // if this is an IMS-Hit on Release ensure we also have the Release.gpg file stored // (previously an unknown pubkey) – but only if the Release file exists locally (unlikely // event of InRelease removed from the mirror causing fallback but still an IMS-Hit) if (TransactionManager->IMSHit == false || @@ -2898,7 +2898,7 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire * const Owner, << TransactionManager << std::endl; } /*}}}*/ -// AcqIndex::Init - defered Constructor /*{{{*/ +// AcqIndex::Init - deferred Constructor /*{{{*/ static void NextCompressionExtension(std::string &CurrentCompressionExtension, std::string &CompressionExtensions, bool const preview) { size_t const nextExt = CompressionExtensions.find(' '); @@ -3642,7 +3642,7 @@ std::string pkgAcqChangelog::URI(std::string const &Template, if (Template.find("@CHANGEPATH@") == std::string::npos) return ""; - // the path is: COMPONENT/SRC/SRCNAME/SRCNAME_SRCVER, e.g. main/a/apt/1.1 or contrib/liba/libapt/2.0 + // the path is: COMPONENT/SRC/SRCNAME/SRCNAME_SRCVER, e.g. main/a/apt/apt_1.1 or contrib/liba/libapt/libapt_2.0 std::string Src = SrcName; std::string path = APT::String::Startswith(SrcName, "lib") ? Src.substr(0, 4) : Src.substr(0,1); path.append("/").append(Src).append("/"); diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 8be8801bf..7741dbf22 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -114,7 +114,7 @@ class pkgAcquire::Item : public WeakPointable /*{{{*/ /** \brief A client-supplied unique identifier. * - * This field is initalized to 0; it is meant to be filled in by + * This field is initialized to 0; it is meant to be filled in by * clients that wish to use it to uniquely identify items. * * APT progress reporting will store an ID there as shown in "Get:42 …" diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 39d5e61f2..ab0908014 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -239,7 +239,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) Dequeue(); } /*}}}*/ -// AcqMethod::MediaFail - Syncronous request for new media /*{{{*/ +// AcqMethod::MediaFail - Synchronous request for new media /*{{{*/ // --------------------------------------------------------------------- /* This sends a 403 Media Failure message to the APT and waits for it to be ackd */ diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 7d6e6f79c..c15e7ab4c 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -664,6 +664,8 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item) if (isDoomedItem(Item->Owner)) return true; + Item->SyncDestinationFiles(); + string Message = "600 URI Acquire\n"; Message.reserve(300); Message += "URI: " + Item->URI; @@ -673,7 +675,9 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item) for (HashStringList::const_iterator hs = hsl.begin(); hs != hsl.end(); ++hs) Message += "\nExpected-" + hs->HashType() + ": " + hs->HashValue(); - if (hsl.FileSize() == 0) + Message += Item->Custom600Headers(); + + if (hsl.FileSize() == 0 && Message.find("\nMaximum-Size: ") == std::string::npos) { unsigned long long FileSize = Item->GetMaximumSize(); if(FileSize > 0) @@ -684,8 +688,6 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item) } } - Item->SyncDestinationFiles(); - Message += Item->Custom600Headers(); Message += "\n\n"; if (RealFileExists(Item->Owner->DestFile)) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 4ccfa2605..3f7f2bbf0 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -117,6 +117,12 @@ static bool SetupAPTPartialDirectory(std::string const &grand, std::string const if (chmod(partial.c_str(), 0700) != 0) _error->WarningE("SetupAPTPartialDirectory", "chmod 0700 of directory %s failed", partial.c_str()); + _error->PushToStack(); + // remove 'old' FAILED files to stop us from collecting them for no reason + for (auto const &Failed: GetListOfFilesInDir(partial, "FAILED", false, false)) + RemoveFile("SetupAPTPartialDirectory", Failed); + _error->RevertToStack(); + return true; } bool pkgAcquire::Setup(pkgAcquireStatus *Progress, string const &Lock) @@ -640,7 +646,7 @@ static void CheckDropPrivsMustBeDisabled(pkgAcquire const &Fetcher) // if destination file is inaccessible all hope is lost for privilege dropping if (IsAccessibleBySandboxUser((*I)->DestFile, true) == false) { - _error->WarningE("pkgAcquire::Run", _("Can't drop privileges for downloading as file '%s' couldn't be accessed by user '%s'."), + _error->WarningE("pkgAcquire::Run", _("Download is performed unsandboxed as root as file '%s' couldn't be accessed by user '%s'."), (*I)->DestFile.c_str(), SandboxUser.c_str()); _config->Set("APT::Sandbox::User", ""); break; @@ -657,7 +663,7 @@ static void CheckDropPrivsMustBeDisabled(pkgAcquire const &Fetcher) if (IsAccessibleBySandboxUser(source.Path, false) == false) { - _error->NoticeE("pkgAcquire::Run", _("Can't drop privileges for downloading as file '%s' couldn't be accessed by user '%s'."), + _error->NoticeE("pkgAcquire::Run", _("Download is performed unsandboxed as root as file '%s' couldn't be accessed by user '%s'."), source.Path.c_str(), SandboxUser.c_str()); _config->CndSet("Binary::file::APT::Sandbox::User", "root"); _config->CndSet("Binary::copy::APT::Sandbox::User", "root"); @@ -912,11 +918,27 @@ pkgAcquire::Queue::~Queue() /* */ bool pkgAcquire::Queue::Enqueue(ItemDesc &Item) { + // MetaKeysMatch checks whether the two items have no non-matching + // meta-keys. If the items are not transaction items, it returns + // true, so other items can still be merged. + auto MetaKeysMatch = [](pkgAcquire::ItemDesc const &A, pkgAcquire::Queue::QItem const *B) { + auto OwnerA = dynamic_cast<pkgAcqTransactionItem*>(A.Owner); + if (OwnerA == nullptr) + return true; + + for (auto const & OwnerBUncast : B->Owners) { + auto OwnerB = dynamic_cast<pkgAcqTransactionItem*>(OwnerBUncast); + + if (OwnerB != nullptr && OwnerA->GetMetaKey() != OwnerB->GetMetaKey()) + return false; + } + return true; + }; QItem **OptimalI = &Items; QItem **I = &Items; // move to the end of the queue and check for duplicates here for (; *I != 0; ) { - if (Item.URI == (*I)->URI) + if (Item.URI == (*I)->URI && MetaKeysMatch(Item, *I)) { if (_config->FindB("Debug::pkgAcquire::Worker",false) == true) std::cerr << " @ Queue: Action combined for " << Item.URI << " and " << (*I)->URI << std::endl; diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 1fae662f8..5f1212338 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -10,11 +10,11 @@ Each file to download is represented by an Acquire::Item class subclassed into a specialization. The Item class can add itself to several URI - acquire queues each prioritized by the download scheduler. When the - system is run the proper URI handlers are spawned and the the acquire + acquire queues each prioritized by the download scheduler. When the + system is run the proper URI handlers are spawned and the acquire queues are fed into the handlers by the schedular until the queues are empty. This allows for an Item to be downloaded from an alternate source - if the first try turns out to fail. It also alows concurrent downloading + if the first try turns out to fail. It also allows concurrent downloading of multiple items from multiple sources as well as dynamic balancing of load between the sources. @@ -241,7 +241,7 @@ class pkgAcquire */ bool RunFdsSane(fd_set *RSet,fd_set *WSet); - // just here for compatbility, needs to be removed on the next + // just here for compatibility, needs to be removed on the next // ABI/API break. RunFdsSane() is what should be used as it // returns if there is an error condition on one of the fds virtual void RunFds(fd_set *RSet,fd_set *WSet); @@ -395,7 +395,7 @@ class pkgAcquire /** \brief Represents a single download source from which an item * should be downloaded. * - * An item may have several assocated ItemDescs over its lifetime. + * An item may have several associated ItemDescs over its lifetime. */ struct pkgAcquire::ItemDesc : public WeakPointable { diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 65c5ff85d..95e756c15 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1051,7 +1051,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix) } } - // Hm, nothing can possibly satisify this dep. Nuke it. + // Hm, nothing can possibly satisfy this dep. Nuke it. if (VList[0] == 0 && Start.IsNegative() == false && (Flags[I->ID] & Protected) != Protected) @@ -1144,7 +1144,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix) pkgCache::PkgIterator I = Cache.PkgBegin(); for (;I.end() != true; ++I) { if (Cache[I].NewInstall() && !(Flags[I->ID] & PreInstalled)) { - if(_config->FindI("Debug::pkgAutoRemove",false)) { + if(_config->FindB("Debug::pkgAutoRemove",false)) { std::clog << "Resolve installed new pkg: " << I.FullName(false) << " (now marking it as auto)" << std::endl; } @@ -1189,7 +1189,7 @@ bool pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator I) /*}}}*/ // ProblemResolver::ResolveByKeep - Resolve problems using keep /*{{{*/ // --------------------------------------------------------------------- -/* This is the work horse of the soft upgrade routine. It is very gental +/* This is the work horse of the soft upgrade routine. It is very gentle in that it does not install or remove any packages. It is assumed that the system was non-broken previously. */ bool pkgProblemResolver::ResolveByKeep(OpProgress * const Progress) @@ -1204,7 +1204,7 @@ bool pkgProblemResolver::ResolveByKeep(OpProgress * const Progress) /*}}}*/ // ProblemResolver::ResolveByKeepInternal - Resolve problems using keep /*{{{*/ // --------------------------------------------------------------------- -/* This is the work horse of the soft upgrade routine. It is very gental +/* This is the work horse of the soft upgrade routine. It is very gentle in that it does not install or remove any packages. It is assumed that the system was non-broken previously. */ bool pkgProblemResolver::ResolveByKeepInternal() @@ -1283,7 +1283,7 @@ bool pkgProblemResolver::ResolveByKeepInternal() continue; /* Hm, the group is broken.. I suppose the best thing to do is to - is to try every combination of keep/not-keep for the set, but thats + is to try every combination of keep/not-keep for the set, but that's slow, and this never happens, just be conservative and assume the list of ors is in preference and keep till it starts to work. */ while (true) @@ -1373,7 +1373,7 @@ void pkgProblemResolver::InstallProtect() /*}}}*/ // PrioSortList - Sort a list of versions by priority /*{{{*/ // --------------------------------------------------------------------- -/* This is ment to be used in conjunction with AllTargets to get a list +/* This is meant to be used in conjunction with AllTargets to get a list of versions ordered by preference. */ struct PrioComp { diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 86c9c6af1..a0ba648b4 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -322,7 +322,7 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache string const arch = _config->Find("APT::Architecture"); archs = _config->FindVector("APT::Architectures"); - if (archs.empty() == true) + if (archs.empty() == true && _system != nullptr) archs = _system->ArchitecturesSupported(); if (archs.empty() == true || diff --git a/apt-pkg/cachefilter.cc b/apt-pkg/cachefilter.cc index b1adf5de3..cc4cdf73c 100644 --- a/apt-pkg/cachefilter.cc +++ b/apt-pkg/cachefilter.cc @@ -14,7 +14,9 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/macros.h> +#include <algorithm> #include <string> +#include <unordered_map> #include <string.h> #include <regex.h> #include <fnmatch.h> @@ -22,6 +24,9 @@ #include <apti18n.h> /*}}}*/ namespace APT { + +APT_HIDDEN std::unordered_map<std::string, std::vector<std::string>> ArchToTupleMap; + namespace CacheFilter { APT_CONST Matcher::~Matcher() {} APT_CONST PackageMatcher::~PackageMatcher() {} @@ -68,38 +73,72 @@ bool PackageNameMatchesFnmatch::operator() (pkgCache::GrpIterator const &Grp) { return fnmatch(Pattern.c_str(), Grp.Name(), FNM_CASEFOLD) == 0; } /*}}}*/ -// Architecture matches <libc>-<kernel>-<cpu> specification /*{{{*/ +// Architecture matches <abi>-<libc>-<kernel>-<cpu> specification /*{{{*/ //---------------------------------------------------------------------- -/* The complete architecture, consisting of <libc>-<kernel>-<cpu>. */ -static std::string CompleteArch(std::string const &arch, bool const isPattern) { - auto const found = arch.find('-'); - if (found != std::string::npos) + +static std::vector<std::string> ArchToTuple(std::string arch) { + // Strip leading linux- from arch if present + // dpkg says this may disappear in the future + if (APT::String::Startswith(arch, std::string("linux-"))) + arch = arch.substr(6); + + auto it = ArchToTupleMap.find(arch); + if (it != ArchToTupleMap.end()) + { + std::vector<std::string> result = it->second; + // Hack in support for triplets + if (result.size() == 3) + result.emplace(result.begin(), "base"); + return result; + } else { - // ensure that only -any- is replaced and not something like company- - std::string complete = std::string("-").append(arch).append("-"); - size_t pos = 0; - char const * const search = "-any-"; - auto const search_len = strlen(search) - 2; - while((pos = complete.find(search, pos)) != std::string::npos) { - complete.replace(pos + 1, search_len, "*"); - pos += 2; + return {}; + } +} + +static std::vector<std::string> PatternToTuple(std::string const &arch) { + std::vector<std::string> tuple = VectorizeString(arch, '-'); + if (std::find(tuple.begin(), tuple.end(), std::string("any")) != tuple.end() || + std::find(arch.begin(), arch.end(), '*') != arch.end()) { + while (tuple.size() < 4) { + tuple.emplace(tuple.begin(), "any"); + } + return tuple; + } else + return ArchToTuple(arch); +} + +/* The complete architecture, consisting of <abi>-<libc>-<kernel>-<cpu>. */ +static std::string CompleteArch(std::string const &arch, bool const isPattern) { + auto tuple = isPattern ? PatternToTuple(arch) : ArchToTuple(arch); + + // Bah, the commandline will try and pass us stuff like amd64- -- we need + // that not to match an architecture, but the code below would turn it into + // a valid tuple. Let's just use an invalid tuple here. + if (APT::String::Endswith(arch, "-") || APT::String::Startswith(arch, "-")) + return "invalid-invalid-invalid-invalid"; + + if (tuple.empty()) { + // Fallback for unknown architectures + // Patterns never fail if they contain wildcards, so by this point, arch + // has no wildcards. + tuple = VectorizeString(arch, '-'); + switch (tuple.size()) { + case 1: + tuple.emplace(tuple.begin(), "linux"); + /* fall through */ + case 2: + tuple.emplace(tuple.begin(), "gnu"); + /* fall through */ + case 3: + tuple.emplace(tuple.begin(), "base"); + /* fall through */ + break; } - complete = complete.substr(1, complete.size()-2); - if (arch.find('-', found+1) != std::string::npos) - // <libc>-<kernel>-<cpu> format - return complete; - // <kernel>-<cpu> format - else if (isPattern) - return "*-" + complete; - else - return "gnu-" + complete; } - else if (arch == "any") - return "*-*-*"; - else if (isPattern) - return "*-linux-" + arch; - else - return "gnu-linux-" + arch; + + std::replace(tuple.begin(), tuple.end(), std::string("any"), std::string("*")); + return APT::String::Join(tuple, "-"); } PackageArchitectureMatchesSpecification::PackageArchitectureMatchesSpecification(std::string const &pattern, bool const pisPattern) : literal(pattern), complete(CompleteArch(pattern, pisPattern)), isPattern(pisPattern) { diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 816925c4d..f8ab7acb9 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -858,7 +858,7 @@ APT_IGNORE_DEPRECATED_PUSH case TASK: showTaskSelection(pkg, pattern); break; case FNMATCH: showFnmatchSelection(pkg, pattern); break; APT_IGNORE_DEPRECATED_POP - case PACKAGENAME: /* no suprises here */ break; + case PACKAGENAME: /* no surprises here */ break; case STRING: /* handled by the special cases */ break; case UNKNOWN: break; } @@ -898,7 +898,7 @@ APT_IGNORE_DEPRECATED_POP case INSTCAND: case ALL: case CANDANDINST: - // not really suprises, but in fact: just not implemented + // not really surprises, but in fact: just not implemented break; } } diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 7edeac4af..1ac61af59 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -465,7 +465,7 @@ APT_IGNORE_DEPRECATED_POP /** \brief returns all packages in the cache who belong to the given task A simple helper responsible for search for all members of a task - in the cache. Optional it prints a a notice about the + in the cache. Optional it prints a notice about the packages chosen cause of the given task. \param Cache the packages are in \param pattern name of the task @@ -483,7 +483,7 @@ APT_IGNORE_DEPRECATED_POP /** \brief returns all packages in the cache whose name matchs a given pattern A simple helper responsible for executing a regular expression on all - package names in the cache. Optional it prints a a notice about the + package names in the cache. Optional it prints a notice about the packages chosen cause of the given package. \param Cache the packages are in \param pattern regular expression for package names diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index d83d05f9e..a3248fc17 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -67,7 +67,7 @@ bool pkgCdrom::FindPackages(string CD, InfoDir = InfoDir + CD + ".disk/"; } - // Don't look into directories that have been marked to ingore. + // Don't look into directories that have been marked to ignore. if (RealFileExists(".aptignr") == true) return true; diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index c8a6e2787..029ec3060 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -402,21 +402,27 @@ void CommandLine::SaveInConfig(unsigned int const &argc, char const * const * co bool closeQuote = false; for (unsigned int i = 0; i < argc && length < sizeof(cmdline); ++i, ++length) { - for (unsigned int j = 0; argv[i][j] != '\0' && length < sizeof(cmdline)-1; ++j, ++length) + for (unsigned int j = 0; argv[i][j] != '\0' && length < sizeof(cmdline)-2; ++j) { - cmdline[length] = argv[i][j]; + // we can't really sensibly deal with quoting so skip it + if (strchr("\"\'\r\n", argv[i][j]) != nullptr) + continue; + cmdline[length++] = argv[i][j]; if (lastWasOption == true && argv[i][j] == '=') { // That is possibly an option: Quote it if it includes spaces, // the benefit is that this will eliminate also most false positives const char* c = strchr(&argv[i][j+1], ' '); if (c == NULL) continue; - cmdline[++length] = '"'; + cmdline[length++] = '\''; closeQuote = true; } } if (closeQuote == true) - cmdline[length++] = '"'; + { + cmdline[length++] = '\''; + closeQuote = false; + } // Problem: detects also --hello if (cmdline[length-1] == 'o') lastWasOption = true; diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 9007bf9ec..78a98d614 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -31,10 +31,13 @@ #include <string.h> #include <algorithm> +#include <iterator> #include <string> #include <stack> #include <vector> #include <fstream> +#include <sstream> +#include <unordered_map> #include <apti18n.h> @@ -43,6 +46,155 @@ using namespace std; Configuration *_config = new Configuration; +/* TODO: This config verification shouldn't be using a static variable + but a Cnf-member – but that would need ABI breaks and stuff and for now + that really is an apt-dev-only tool, so it isn't that bad that it is + unusable and allaround a bit strange */ +enum class APT_HIDDEN ConfigType { UNDEFINED, INT, BOOL, STRING, STRING_OR_BOOL, STRING_OR_LIST, FILE, DIR, LIST, PROGRAM_PATH = FILE }; +APT_HIDDEN std::unordered_map<std::string, ConfigType> apt_known_config {}; +static std::string getConfigTypeString(ConfigType const type) /*{{{*/ +{ + switch (type) + { + case ConfigType::UNDEFINED: return "UNDEFINED"; + case ConfigType::INT: return "INT"; + case ConfigType::BOOL: return "BOOL"; + case ConfigType::STRING: return "STRING"; + case ConfigType::STRING_OR_BOOL: return "STRING_OR_BOOL"; + case ConfigType::FILE: return "FILE"; + case ConfigType::DIR: return "DIR"; + case ConfigType::LIST: return "LIST"; + case ConfigType::STRING_OR_LIST: return "STRING_OR_LIST"; + } + return "UNKNOWN"; +} + /*}}}*/ +static ConfigType getConfigType(std::string const &type) /*{{{*/ +{ + if (type == "<INT>") + return ConfigType::INT; + else if (type == "<BOOL>") + return ConfigType::BOOL; + else if (type == "<STRING>") + return ConfigType::STRING; + else if (type == "<STRING_OR_BOOL>") + return ConfigType::STRING_OR_BOOL; + else if (type == "<FILE>") + return ConfigType::FILE; + else if (type == "<DIR>") + return ConfigType::DIR; + else if (type == "<LIST>") + return ConfigType::LIST; + else if (type == "<STRING_OR_LIST>") + return ConfigType::STRING_OR_LIST; + else if (type == "<PROGRAM_PATH>") + return ConfigType::PROGRAM_PATH; + return ConfigType::UNDEFINED; +} + /*}}}*/ +// checkFindConfigOptionType - workhorse of option checking /*{{{*/ +static void checkFindConfigOptionTypeInternal(std::string name, ConfigType const type) +{ + std::transform(name.begin(), name.end(), name.begin(), ::tolower); + auto known = apt_known_config.find(name); + if (known == apt_known_config.cend()) + { + auto const rcolon = name.rfind(':'); + if (rcolon != std::string::npos) + { + known = apt_known_config.find(name.substr(0, rcolon) + ":*"); + if (known == apt_known_config.cend()) + { + auto const parts = StringSplit(name, "::"); + size_t psize = parts.size(); + if (psize > 1) + { + for (size_t max = psize; max != 1; --max) + { + std::ostringstream os; + std::copy(parts.begin(), parts.begin() + max, std::ostream_iterator<std::string>(os, "::")); + os << "**"; + known = apt_known_config.find(os.str()); + if (known != apt_known_config.cend() && known->second == ConfigType::UNDEFINED) + return; + } + for (size_t max = psize - 1; max != 1; --max) + { + std::ostringstream os; + std::copy(parts.begin(), parts.begin() + max - 1, std::ostream_iterator<std::string>(os, "::")); + os << "*::"; + std::copy(parts.begin() + max + 1, parts.end() - 1, std::ostream_iterator<std::string>(os, "::")); + os << *(parts.end() - 1); + known = apt_known_config.find(os.str()); + if (known != apt_known_config.cend()) + break; + } + } + } + } + } + if (known == apt_known_config.cend()) + _error->Warning("Using unknown config option »%s« of type %s", + name.c_str(), getConfigTypeString(type).c_str()); + else if (known->second != type) + { + if (known->second == ConfigType::DIR && type == ConfigType::FILE) + ; // implementation detail + else if (type == ConfigType::STRING && (known->second == ConfigType::FILE || known->second == ConfigType::DIR)) + ; // TODO: that might be an error or not, we will figure this out later + else if (known->second == ConfigType::STRING_OR_BOOL && (type == ConfigType::BOOL || type == ConfigType::STRING)) + ; + else if (known->second == ConfigType::STRING_OR_LIST && (type == ConfigType::LIST || type == ConfigType::STRING)) + ; + else + _error->Warning("Using config option »%s« of type %s as a type %s", + name.c_str(), getConfigTypeString(known->second).c_str(), getConfigTypeString(type).c_str()); + } +} +static void checkFindConfigOptionType(char const * const name, ConfigType const type) +{ + if (apt_known_config.empty()) + return; + checkFindConfigOptionTypeInternal(name, type); +} + /*}}}*/ +static bool LoadConfigurationIndex(std::string const &filename) /*{{{*/ +{ + apt_known_config.clear(); + if (filename.empty()) + return true; + Configuration Idx; + if (ReadConfigFile(Idx, filename) == false) + return false; + + Configuration::Item const * Top = Idx.Tree(nullptr); + if (unlikely(Top == nullptr)) + return false; + + do { + if (Top->Value.empty() == false) + { + std::string fulltag = Top->FullTag(); + std::transform(fulltag.begin(), fulltag.end(), fulltag.begin(), ::tolower); + apt_known_config.emplace(std::move(fulltag), getConfigType(Top->Value)); + } + + if (Top->Child != nullptr) + { + Top = Top->Child; + continue; + } + + while (Top != nullptr && Top->Next == nullptr) + Top = Top->Parent; + if (Top != nullptr) + Top = Top->Next; + } while (Top != nullptr); + + return true; +} + /*}}}*/ + // Configuration::Configuration - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -160,6 +312,7 @@ Configuration::Item *Configuration::Lookup(const char *Name,bool const &Create) /* */ string Configuration::Find(const char *Name,const char *Default) const { + checkFindConfigOptionType(Name, ConfigType::STRING); const Item *Itm = Lookup(Name); if (Itm == 0 || Itm->Value.empty() == true) { @@ -179,6 +332,7 @@ string Configuration::Find(const char *Name,const char *Default) const */ string Configuration::FindFile(const char *Name,const char *Default) const { + checkFindConfigOptionType(Name, ConfigType::FILE); const Item *RootItem = Lookup("RootDir"); std::string result = (RootItem == 0) ? "" : RootItem->Value; if(result.empty() == false && result[result.size() - 1] != '/') @@ -233,6 +387,7 @@ string Configuration::FindFile(const char *Name,const char *Default) const /* This is like findfile execept the result is terminated in a / */ string Configuration::FindDir(const char *Name,const char *Default) const { + checkFindConfigOptionType(Name, ConfigType::DIR); string Res = FindFile(Name,Default); if (Res.end()[-1] != '/') { @@ -249,6 +404,7 @@ string Configuration::FindDir(const char *Name,const char *Default) const /* Returns a vector of config values under the given item */ vector<string> Configuration::FindVector(const char *Name, std::string const &Default, bool const Keys) const { + checkFindConfigOptionType(Name, ConfigType::LIST); vector<string> Vec; const Item *Top = Lookup(Name); if (Top == NULL) @@ -274,6 +430,7 @@ vector<string> Configuration::FindVector(const char *Name, std::string const &De /* */ int Configuration::FindI(const char *Name,int const &Default) const { + checkFindConfigOptionType(Name, ConfigType::INT); const Item *Itm = Lookup(Name); if (Itm == 0 || Itm->Value.empty() == true) return Default; @@ -291,6 +448,7 @@ int Configuration::FindI(const char *Name,int const &Default) const /* */ bool Configuration::FindB(const char *Name,bool const &Default) const { + checkFindConfigOptionType(Name, ConfigType::BOOL); const Item *Itm = Lookup(Name); if (Itm == 0 || Itm->Value.empty() == true) return Default; @@ -774,7 +932,8 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio if ((*I == '/' && I + 1 != End && I[1] == '/') || (*I == '#' && strcmp(string(I,I+6).c_str(),"#clear") != 0 && - strcmp(string(I,I+8).c_str(),"#include") != 0)) + strcmp(string(I,I+8).c_str(),"#include") != 0 && + strcmp(string(I,I+strlen("#x-apt-configure-index")).c_str(), "#x-apt-configure-index") != 0)) { End = I; break; @@ -889,7 +1048,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio { Stack.push(ParentTag); - /* Make sectional tags incorperate the section into the + /* Make sectional tags incorporate the section into the tag string */ if (AsSectional == true && Word.empty() == false) { @@ -939,6 +1098,11 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio return _error->Error(_("Syntax error %s:%u: Included from here"),FName.c_str(),CurLine); } } + else if (Tag == "x-apt-configure-index") + { + if (LoadConfigurationIndex(Word) == false) + return _error->Warning("Loading the configure index %s in file %s:%u failed!", Word.c_str(), FName.c_str(), CurLine); + } else return _error->Error(_("Syntax error %s:%u: Unsupported directive '%s'"),FName.c_str(),CurLine,Tag.c_str()); } diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index bcaa7c995..5ad408d25 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -3,7 +3,7 @@ // $Id: error.h,v 1.8 2001/05/07 05:06:52 jgg Exp $ /* ###################################################################### - Global Erorr Class - Global error mechanism + Global Error Class - Global error mechanism This class has a single global instance. When a function needs to generate an error condition, such as a read error, it calls a member diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index f3c7b6d3b..a90cd647a 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -2949,7 +2949,7 @@ static std::string APT_NONNULL(1) GetTempDirEnv(char const * const env) /*{{{*/ stat(tmpdir, &st) != 0 || (st.st_mode & S_IFDIR) == 0) // exists and is directory tmpdir = "/tmp"; else if (geteuid() != 0 && // root can do everything anyway - faccessat(-1, tmpdir, R_OK | W_OK | X_OK, AT_EACCESS | AT_SYMLINK_NOFOLLOW) != 0) // current user has rwx access to directory + faccessat(AT_FDCWD, tmpdir, R_OK | W_OK | X_OK, AT_EACCESS) != 0) // current user has rwx access to directory tmpdir = "/tmp"; return string(tmpdir); diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index cdf1e7f42..d4ccf47c7 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -146,7 +146,6 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, } enum { DETACHED, CLEARSIGNED } releaseSignature = (FileGPG != File) ? DETACHED : CLEARSIGNED; - std::vector<std::string> dataHeader; char * sig = NULL; char * data = NULL; char * conf = nullptr; @@ -205,7 +204,7 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, message.OpenDescriptor(dataFd, FileFd::WriteOnly, true); if (signature.Failed() == true || message.Failed() == true || - SplitClearSignedFile(File, &message, &dataHeader, &signature) == false) + SplitClearSignedFile(File, &message, nullptr, &signature) == false) { apt_error(std::cerr, statusfd, fd, "Splitting up %s into data and signature failed", File.c_str()); local_exit(112); @@ -304,6 +303,20 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, } /*}}}*/ // SplitClearSignedFile - split message into data/signature /*{{{*/ +static int GetLineErrno(char **lineptr, size_t *n, FILE *stream, std::string const &InFile) +{ + int result; + + errno = 0; + result = getline(lineptr, n, stream); + if (errno != 0) + { + _error->Errno("getline", "Could not read from %s", InFile.c_str()); + return -1; + } + + return result; +} bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile, std::vector<std::string> * const ContentHeader, FileFd * const SignatureFile) { @@ -316,10 +329,13 @@ bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile, bool skip_until_empty_line = false; bool found_signature = false; bool first_line = true; + bool signed_message_not_on_first_line = false; + bool found_garbage = false; char *buf = NULL; size_t buf_size = 0; - while (getline(&buf, &buf_size, in) != -1) + _error->PushToStack(); + while (GetLineErrno(&buf, &buf_size, in, InFile) != -1) { _strrstrip(buf); if (found_message_start == false) @@ -329,6 +345,8 @@ bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile, found_message_start = true; skip_until_empty_line = true; } + else + signed_message_not_on_first_line = found_garbage = true; } else if (skip_until_empty_line == true) { @@ -366,6 +384,8 @@ bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile, if (ContentFile != NULL) ContentFile->Write(dashfree, strlen(dashfree)); } + else + found_garbage = true; } else if (found_signature == true) { @@ -378,11 +398,33 @@ bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile, found_signature = false; // look for other signatures } // all the rest is whitespace, unsigned garbage or additional message blocks we ignore + else + found_garbage = true; } fclose(in); if (buf != NULL) free(buf); + // Flush the files. Errors will be checked below. + if (SignatureFile != nullptr) + SignatureFile->Flush(); + if (ContentFile != nullptr) + ContentFile->Flush(); + + if (found_message_start) + { + if (signed_message_not_on_first_line) + _error->Warning("Clearsigned file '%s' does not start with a signed message block.", InFile.c_str()); + else if (found_garbage) + _error->Warning("Clearsigned file '%s' contains unsigned lines.", InFile.c_str()); + } + + // An error occurred during reading - propagate it up + bool const hasErrored = _error->PendingError(); + _error->MergeWithStack(); + if (hasErrored) + return false; + if (found_signature == true) return _error->Error("Signature in file %s wasn't closed", InFile.c_str()); @@ -406,7 +448,7 @@ bool OpenMaybeClearSignedFile(std::string const &ClearSignedFileName, FileFd &Me free(message); return _error->Errno("mkstemp", "Couldn't create temporary file to work with %s", ClearSignedFileName.c_str()); } - // we have the fd, thats enough for us + // we have the fd, that's enough for us unlink(message); free(message); diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index f63f2eea1..fa93c91af 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -155,9 +155,9 @@ bool MMap::Close(bool DoSync) return true; } /*}}}*/ -// MMap::Sync - Syncronize the map with the disk /*{{{*/ +// MMap::Sync - Synchronize the map with the disk /*{{{*/ // --------------------------------------------------------------------- -/* This is done in syncronous mode - the docs indicate that this will +/* This is done in synchronous mode - the docs indicate that this will not return till all IO is complete */ bool MMap::Sync() { @@ -182,7 +182,7 @@ bool MMap::Sync() return true; } /*}}}*/ -// MMap::Sync - Syncronize a section of the file to disk /*{{{*/ +// MMap::Sync - Synchronize a section of the file to disk /*{{{*/ // --------------------------------------------------------------------- /* */ bool MMap::Sync(unsigned long Start,unsigned long Stop) diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index 1576cab91..b776959c2 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -10,7 +10,7 @@ from file fd's this function will use read and normal allocated memory. - Writing to a public mmap will always fully comit all changes when the + Writing to a public mmap will always fully commit all changes when the class is deleted. Ie it will rewrite the file, unless it is readonly The DynamicMMap class is used to help the on-disk data structure diff --git a/apt-pkg/contrib/proxy.cc b/apt-pkg/contrib/proxy.cc index 62cfba032..1b7a92c68 100644 --- a/apt-pkg/contrib/proxy.cc +++ b/apt-pkg/contrib/proxy.cc @@ -2,7 +2,7 @@ // Description /*{{{*/ /* ###################################################################### - Proxy - Proxy releated functions + Proxy - Proxy related functions ##################################################################### */ /*}}}*/ diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index cf8feb970..88113f7a4 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -27,6 +27,7 @@ #include <locale> #include <sstream> #include <string> +#include <sstream> #include <vector> #include <stddef.h> @@ -85,6 +86,17 @@ bool Startswith(const std::string &s, const std::string &start) return (s.compare(0, start.size(), start) == 0); } +std::string Join(std::vector<std::string> list, const std::string &sep) +{ + std::ostringstream oss; + for (auto it = list.begin(); it != list.end(); it++) + { + if (it != list.begin()) oss << sep; + oss << *it; + } + return oss.str(); +} + } } /*}}}*/ @@ -748,7 +760,7 @@ int StringToBool(const string &Text,int Default) // TimeRFC1123 - Convert a time_t into RFC1123 format /*{{{*/ // --------------------------------------------------------------------- /* This converts a time_t into a string time representation that is - year 2000 complient and timezone neutral */ + year 2000 compliant and timezone neutral */ string TimeRFC1123(time_t Date) { return TimeRFC1123(Date, false); @@ -1466,7 +1478,7 @@ string StripEpoch(const string &VerStr) // tolower_ascii - tolower() function that ignores the locale /*{{{*/ // --------------------------------------------------------------------- /* This little function is the most called method we have and tries - therefore to do the absolut minimum - and is notable faster than + therefore to do the absolute minimum - and is notable faster than standard tolower/toupper and as a bonus avoids problems with different locales - we only operate on ascii chars anyway. */ #undef tolower_ascii @@ -1480,7 +1492,7 @@ int tolower_ascii(int const c) // isspace_ascii - isspace() function that ignores the locale /*{{{*/ // --------------------------------------------------------------------- /* This little function is one of the most called methods we have and tries - therefore to do the absolut minimum - and is notable faster than + therefore to do the absolute minimum - and is notable faster than standard isspace() and as a bonus avoids problems with different locales - we only operate on ascii chars anyway. */ #undef isspace_ascii diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index b58e69cbd..ba41172fd 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -44,6 +44,8 @@ namespace APT { std::string Strip(const std::string &s); bool Endswith(const std::string &s, const std::string &ending); bool Startswith(const std::string &s, const std::string &starting); + std::string Join(std::vector<std::string> list, const std::string &sep); + } } diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 17c283615..3bcd381c0 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -73,8 +73,19 @@ string debListParser::Package() { string Result = Section.Find(pkgTagSection::Key::Package).to_string(); // Normalize mixed case package names to lower case, like dpkg does - // See Bug#807012 for details - std::transform(Result.begin(), Result.end(), Result.begin(), tolower_ascii); + // See Bug#807012 for details. + // Only do this when the package name does not contain a / - as that + // indicates that the package name was derived from a filename given + // to install or build-dep or similar (Bug#854794) + if (likely(Result.find('/') == string::npos)) + { + for (char &c: Result) + { + char l = tolower_ascii_inline(c); + if (unlikely(l != c)) + c = l; + } + } if(unlikely(Result.empty() == true)) _error->Warning("Encountered a section with no Package: header"); @@ -559,11 +570,23 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, bool const &StripMultiArch, bool const &ParseRestrictionsList) { + return debListParser::ParseDepends(Start, Stop, Package, Ver, Op, ParseArchFlags, + StripMultiArch, ParseRestrictionsList, + _config->Find("APT::Architecture")); +} + +const char *debListParser::ParseDepends(const char *Start,const char *Stop, + string &Package,string &Ver, + unsigned int &Op, bool const &ParseArchFlags, + bool const &StripMultiArch, + bool const &ParseRestrictionsList, + string const &Arch) +{ StringView PackageView; StringView VerView; auto res = ParseDepends(Start, Stop, PackageView, VerView, Op, (bool)ParseArchFlags, - (bool) StripMultiArch, (bool) ParseRestrictionsList); + (bool) StripMultiArch, (bool) ParseRestrictionsList, Arch); Package = PackageView.to_string(); Ver = VerView.to_string(); @@ -575,6 +598,17 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, bool StripMultiArch, bool ParseRestrictionsList) { + return debListParser::ParseDepends(Start, Stop, Package, Ver, Op, ParseArchFlags, + StripMultiArch, ParseRestrictionsList, + _config->Find("APT::Architecture")); +} + +const char *debListParser::ParseDepends(const char *Start,const char *Stop, + StringView &Package,StringView &Ver, + unsigned int &Op, bool ParseArchFlags, + bool StripMultiArch, + bool ParseRestrictionsList, string const &Arch) +{ // Strip off leading space for (;Start != Stop && isspace_ascii(*Start) != 0; ++Start); @@ -642,8 +676,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, if (unlikely(ParseArchFlags == true)) { - string const arch = _config->Find("APT::Architecture"); - APT::CacheFilter::PackageArchitectureMatchesSpecification matchesArch(arch, false); + APT::CacheFilter::PackageArchitectureMatchesSpecification matchesArch(Arch, false); // Parse an architecture if (I != Stop && *I == '[') diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 733ea0542..5e945812d 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -105,6 +105,11 @@ class APT_HIDDEN debListParser : public pkgCacheListParser std::string &Package,std::string &Ver,unsigned int &Op, bool const &ParseArchFlags, bool const &StripMultiArch, bool const &ParseRestrictionsList); + APT_PUBLIC static const char *ParseDepends(const char *Start,const char *Stop, + std::string &Package,std::string &Ver,unsigned int &Op, + bool const &ParseArchFlags, bool const &StripMultiArch, + bool const &ParseRestrictionsList, + std::string const &Arch); #ifdef APT_PKG_EXPOSE_STRING_VIEW APT_HIDDEN static const char *ParseDepends(const char *Start,const char *Stop, @@ -112,6 +117,12 @@ class APT_HIDDEN debListParser : public pkgCacheListParser APT::StringView &Ver,unsigned int &Op, bool const ParseArchFlags = false, bool StripMultiArch = true, bool const ParseRestrictionsList = false); + APT_HIDDEN static const char *ParseDepends(const char *Start,const char *Stop, + APT::StringView &Package, + APT::StringView &Ver,unsigned int &Op, + bool const ParseArchFlags, bool StripMultiArch, + bool const ParseRestrictionsList, + std::string const &Arch); #endif APT_PUBLIC static const char *ConvertRelation(const char *I,unsigned int &Op); diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 091b187a2..7d2eb313b 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -274,11 +274,14 @@ static void GetIndexTargetsFor(char const * const Type, std::string const &URI, if (dup != IndexTargets.end()) { std::string const dupEntry = dup->Option(IndexTarget::SOURCESENTRY); - //TRANSLATOR: an identifier like Packages; Releasefile key indicating - // a file like main/binary-amd64/Packages; filename and linenumber of - // two sources.list entries - _error->Warning(_("Target %s (%s) is configured multiple times in %s and %s"), - T->c_str(), MetaKey.c_str(), dupEntry.c_str(), E->sourcesEntry.c_str()); + if (T->find("legacy") == std::string::npos) + { + //TRANSLATOR: an identifier like Packages; Releasefile key indicating + // a file like main/binary-amd64/Packages; filename and linenumber of + // two sources.list entries + _error->Warning(_("Target %s (%s) is configured multiple times in %s and %s"), + T->c_str(), MetaKey.c_str(), dupEntry.c_str(), E->sourcesEntry.c_str()); + } if (tplMetaKey.find(BreakPoint) == std::string::npos) break; continue; @@ -1101,8 +1104,11 @@ class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type /*{{{*/ UseByHash = _config->Find("Acquire::By-Hash", UseByHash); { std::string const host = ::URI(URI).Host; - UseByHash = _config->Find("APT::Acquire::" + host + "::By-Hash", UseByHash); - UseByHash = _config->Find("Acquire::" + host + "::By-Hash", UseByHash); + if (host.empty() == false) + { + UseByHash = _config->Find("APT::Acquire::" + host + "::By-Hash", UseByHash); + UseByHash = _config->Find("Acquire::" + host + "::By-Hash", UseByHash); + } std::map<std::string, std::string>::const_iterator const opt = Options.find("by-hash"); if (opt != Options.end()) UseByHash = opt->second; diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h index b412dbaef..bc800bc89 100644 --- a/apt-pkg/deb/debrecords.h +++ b/apt-pkg/deb/debrecords.h @@ -5,8 +5,8 @@ Debian Package Records - Parser for debian package records - This provides display-type parsing for the Packages file. This is - different than the the list parser which provides cache generation + This provides display-type parsing for the Packages file. This is + different than the list parser which provides cache generation services. There should be no overlap between these two. ##################################################################### */ diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index 407b02d39..caaa53063 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -129,8 +129,18 @@ bool debSrcRecordParser::BuildDepends(std::vector<pkgSrcRecords::Parser::BuildDe return _error->Error("Problem parsing dependency: %s", fields[I]); rec.Type = I; - if (rec.Package != "") + // We parsed a package that was ignored (wrong architecture restriction + // or something). + if (rec.Package == "") { + // If we are in an OR group, we need to set the "Or" flag of the + // previous entry to our value. + if (BuildDeps.size() > 0 && (BuildDeps[BuildDeps.size() - 1].Op & pkgCache::Dep::Or) == pkgCache::Dep::Or) { + BuildDeps[BuildDeps.size() - 1].Op &= ~pkgCache::Dep::Or; + BuildDeps[BuildDeps.size() - 1].Op |= (rec.Op & pkgCache::Dep::Or); + } + } else { BuildDeps.push_back(rec); + } if (Start == Stop) break; diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 45ed66996..01282efcc 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -670,7 +670,7 @@ void pkgDPkgPM::ProcessDpkgStatusLine(char *line) if (unlikely(candset.empty())) { if (Debug == true) - std::clog << "unable to figure out which package is dpkg refering to with '" << pkgname << "'! (1)" << std::endl; + std::clog << "unable to figure out which package is dpkg referring to with '" << pkgname << "'! (1)" << std::endl; return; } else if (candset.size() == 1) // we are lucky @@ -760,7 +760,7 @@ void pkgDPkgPM::ProcessDpkgStatusLine(char *line) if (pkgname.find(':') != std::string::npos) { if (Debug == true) - std::clog << "unable to figure out which package is dpkg refering to with '" << pkgname << "'! (2)" << std::endl; + std::clog << "unable to figure out which package is dpkg referring to with '" << pkgname << "'! (2)" << std::endl; return; } } @@ -985,7 +985,8 @@ void pkgDPkgPM::WriteHistoryTag(string const &tag, string value) // DPkgPM::OpenLog /*{{{*/ bool pkgDPkgPM::OpenLog() { - string const logdir = _config->FindDir("Dir::Log"); + string const logfile_name = _config->FindFile("Dir::Log::Terminal"); + string logdir = flNotFile(logfile_name); if(CreateAPTDirectoryIfNeeded(logdir, logdir) == false) // FIXME: use a better string after freeze return _error->Error(_("Directory '%s' missing"), logdir.c_str()); @@ -998,8 +999,6 @@ bool pkgDPkgPM::OpenLog() strftime(timestr, sizeof(timestr), "%F %T", tmp); // open terminal log - string const logfile_name = flCombine(logdir, - _config->Find("Dir::Log::Terminal")); if (!logfile_name.empty()) { d->term_out = fopen(logfile_name.c_str(),"a"); @@ -1020,8 +1019,10 @@ bool pkgDPkgPM::OpenLog() } // write your history - string const history_name = flCombine(logdir, - _config->Find("Dir::Log::History")); + string const history_name = _config->FindFile("Dir::Log::History"); + string logdir2 = flNotFile(logfile_name); + if(logdir != logdir2 && CreateAPTDirectoryIfNeeded(logdir2, logdir2) == false) + return _error->Error(_("Directory '%s' missing"), logdir.c_str()); if (!history_name.empty()) { d->history_out = fopen(history_name.c_str(),"a"); @@ -1447,7 +1448,7 @@ bool pkgDPkgPM::ExpandPendingCalls(std::vector<Item> &List, pkgDepCache &Cache) } bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) { - // explicitely remove&configure everything for hookscripts and progress building + // explicitly remove&configure everything for hookscripts and progress building // we need them only temporarily through, so keep the length and erase afterwards decltype(List)::const_iterator::difference_type explicitIdx = std::distance(List.cbegin(), List.cend()); @@ -1509,7 +1510,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) dpkg_recursive_install = Cache.VS().CmpVersion("1.18.5", dpkgpkg.CurrentVer().VerStr()) <= 0; } // no point in doing this dance for a handful of packages only - unsigned int const dpkg_recursive_install_min = _config->FindB("dpkg::install::recursive::minimum", 5); + unsigned int const dpkg_recursive_install_min = _config->FindI("dpkg::install::recursive::minimum", 5); // FIXME: workaround for dpkg bug, see our ./test-bug-740843-versioned-up-down-breaks test bool const dpkg_recursive_install_numbered = _config->FindB("dpkg::install::recursive::numbered", true); @@ -1911,7 +1912,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) ADDARG(fullname); } } - // skip configure action if all sheduled packages disappeared + // skip configure action if all scheduled packages disappeared if (oldSize == Size) continue; } @@ -2103,7 +2104,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) if (d->dpkg_error.empty() == false) { - // no point in reseting packages we already completed removal for + // no point in resetting packages we already completed removal for StripAlreadyDoneFrom(approvedStates.Remove()); StripAlreadyDoneFrom(approvedStates.Purge()); APT::StateChanges undo; diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 3925d2e7c..f3615302e 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -787,7 +787,7 @@ bool pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser, ActionGroup group(*this); -#if 0 // reseting the autoflag here means we lose the +#if 0 // resetting the autoflag here means we lose the // auto-mark information if a user selects a package for removal // but changes his mind then and sets it for keep again // - this makes sense as default when all Garbage dependencies @@ -1079,7 +1079,7 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, StateCache &P = PkgState[Pkg->ID]; - // See if there is even any possible instalation candidate + // See if there is even any possible installation candidate if (P.CandidateVer == 0) return false; @@ -1781,7 +1781,7 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator const &Dep) const { if (InstallRecommends) return true; - // we suport a special mode to only install-recommends for certain + // we support a special mode to only install-recommends for certain // sections // FIXME: this is a meant as a temporarly solution until the // recommends are cleaned up diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 03a2cb0a8..1ab86644d 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -21,7 +21,7 @@ 3 dependency results. Now - Compared using the Currently install version Install - Compared using the install version (final state) - CVer - (Candidate Verion) Compared using the Candidate Version + CVer - (Candidate Version) Compared using the Candidate Version The candidate and now results are used to decide wheather a package should be automatically installed or if it should be left alone. diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc index d282a0b59..59c7720c3 100644 --- a/apt-pkg/edsp.cc +++ b/apt-pkg/edsp.cc @@ -931,14 +931,18 @@ bool EDSP::WriteProgress(unsigned short const percent, const char* const message } /*}}}*/ // EDSP::WriteError - format an error message to be send to file descriptor /*{{{*/ +static std::string formatMessage(std::string const &msg) +{ + return SubstVar(SubstVar(APT::String::Strip(msg), "\n\n", "\n.\n"), "\n", "\n "); +} bool EDSP::WriteError(char const * const uuid, std::string const &message, FILE* output) { fprintf(output, "Error: %s\n", uuid); - fprintf(output, "Message: %s\n\n", SubstVar(SubstVar(message, "\n\n", "\n.\n"), "\n", "\n ").c_str()); + fprintf(output, "Message: %s\n\n", formatMessage(message).c_str()); return true; } bool EDSP::WriteError(char const * const uuid, std::string const &message, FileFd &output) { return WriteOkay(output, "Error: ", uuid, "\n", - "Message: ", SubstVar(SubstVar(message, "\n\n", "\n.\n"), "\n", "\n "), + "Message: ", formatMessage(message), "\n\n"); } /*}}}*/ diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h index ed49ac28c..2c9082ed3 100644 --- a/apt-pkg/edsp.h +++ b/apt-pkg/edsp.h @@ -133,7 +133,7 @@ namespace EDSP /*{{{*/ * \param[out] remove is a list which gets populated with requested removals * \param[out] upgrade is true if it is a request like apt-get upgrade * \param[out] distUpgrade is true if it is a request like apt-get dist-upgrade - * \param[out] autoRemove is true if removal of uneeded packages should be performed + * \param[out] autoRemove is true if removal of unneeded packages should be performed * * \return true if the request could be found and worked on, otherwise false */ diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index 68753a40a..046216ab2 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -155,7 +155,7 @@ class pkgIndexFile rather bad (doesn't take three character like ast into account).*/ APT_DEPRECATED_MSG("These methods make no sense anymore with multi-language support") static bool CheckLanguageCode(const char * const Lang); /* As we have now possibly more than one LanguageCode this method is - superseeded by a) private classmembers or b) getLanguages() */ + superseded by a) private classmembers or b) getLanguages() */ APT_DEPRECATED_MSG("These methods make no sense anymore with multi-language support") static std::string LanguageCode(); bool IsTrusted() const { return Trusted; }; diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 292d75071..00d991027 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -20,6 +20,11 @@ #include <string.h> #include <cstdlib> +#include <fstream> +#include <sstream> +#include <string> +#include <unordered_map> +#include <vector> #include <apti18n.h> /*}}}*/ @@ -30,6 +35,89 @@ const char *pkgVersion = PACKAGE_VERSION; const char *pkgLibVersion = Stringfy(APT_PKG_MAJOR) "." Stringfy(APT_PKG_MINOR) "." Stringfy(APT_PKG_RELEASE); +namespace APT { + APT_HIDDEN extern std::unordered_map<std::string, std::vector<std::string>> ArchToTupleMap; +} + +// Splits by whitespace. There may be continuous spans of whitespace - they +// will be considered as one. +static std::vector<std::string> split(std::string const & s) +{ + std::vector<std::string> vec; + std::istringstream iss(s); + iss.imbue(std::locale::classic()); + for(std::string current_s; iss >> current_s; ) + vec.push_back(current_s); + return vec; +} + + +// pkgInitArchTupleMap - Initialize the architecture tuple map /*{{{*/ +// --------------------------------------------------------------------- +/* This initializes */ +static bool pkgInitArchTupleMap() +{ + auto tuplepath = _config->FindFile("Dir::dpkg::tupletable", DPKG_DATADIR "/tupletable"); + auto tripletpath = _config->FindFile("Dir::dpkg::triplettable", DPKG_DATADIR "/triplettable"); + auto cpupath = _config->FindFile("Dir::dpkg::cputable", DPKG_DATADIR "/cputable"); + + // Load a list of CPUs + std::vector<std::string> cpus; + std::ifstream cputable(cpupath); + for (std::string cpuline; std::getline(cputable, cpuline); ) + { + if (cpuline[0] == '#' || cpuline[0] == '\0') + continue; + auto cpurow = split(cpuline); + auto cpu = APT::String::Strip(cpurow.at(0)); + + cpus.push_back(cpu); + } + if (!cputable.eof()) + return _error->Error("Error reading the CPU table"); + + // Load the architecture tuple + std::ifstream tupletable; + if (FileExists(tuplepath)) + tupletable.open(tuplepath); + else if (FileExists(tripletpath)) + tupletable.open(tripletpath); + else + return _error->Error("Cannot find dpkg tuplet or triplet table"); + + APT::ArchToTupleMap.clear(); + for (std::string tupleline; std::getline(tupletable, tupleline); ) + { + if (tupleline[0] == '#' || tupleline[0] == '\0') + continue; + + std::vector<std::string> tuplerow = split(tupleline); + + auto tuple = APT::String::Strip(tuplerow.at(0)); + auto arch = APT::String::Strip(tuplerow.at(1)); + + if (tuple.find("<cpu>") == tuple.npos && arch.find("<cpu>") == arch.npos) + { + APT::ArchToTupleMap.insert({arch, VectorizeString(tuple, '-')}); + } + else + { + for (auto && cpu : cpus) + { + auto mytuple = SubstVar(tuple, std::string("<cpu>"), cpu); + auto myarch = SubstVar(arch, std::string("<cpu>"), cpu); + + APT::ArchToTupleMap.insert({myarch, VectorizeString(mytuple, '-')}); + } + } + } + if (!tupletable.eof()) + return _error->Error("Error reading the Tuple table"); + + return true; +} + /*}}}*/ + // pkgInitConfig - Initialize the configuration class /*{{{*/ // --------------------------------------------------------------------- @@ -84,6 +172,7 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$"); Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$"); Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.ucf-[a-z]+$"); Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$"); Cnf.Set("Dir::Ignore-Files-Silently::", "\\.orig$"); Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$"); @@ -193,6 +282,9 @@ bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys) if (Sys == 0) return _error->Error(_("Unable to determine a suitable packaging system type")); } + + if (pkgInitArchTupleMap() == false) + return false; return Sys->Initialize(Cnf); } diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index bfdc50e6c..0be0cc8df 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -57,7 +57,7 @@ There are complications in this algorithm when presented with cycles. For all known practical cases it works, all cases where it doesn't work is fixable by tweaking the package descriptions. However, it should be - possible to impove this further to make some better choices when + possible to improve this further to make some better choices when presented with cycles. ##################################################################### */ @@ -134,7 +134,7 @@ bool pkgOrderList::IsMissing(PkgIterator Pkg) /*}}}*/ // OrderList::DoRun - Does an order run /*{{{*/ // --------------------------------------------------------------------- -/* The caller is expeted to have setup the desired probe state */ +/* The caller is expected to have setup the desired probe state */ bool pkgOrderList::DoRun() { // Temp list @@ -587,7 +587,7 @@ bool pkgOrderList::VisitNode(PkgIterator Pkg, char const* from) DepFunc Old = Primary; - // Perform immedate configuration of the package if so flagged. + // Perform immediate configuration of the package if so flagged. if (IsFlag(Pkg,Immediate) == true && Primary != &pkgOrderList::DepUnPackPre) Primary = &pkgOrderList::DepUnPackPreD; @@ -875,7 +875,7 @@ bool pkgOrderList::DepUnPackDep(DepIterator D) orders configuration so that when a package comes to be configured it's dependents are configured. - Loops are ingored. Depends loop entry points are chaotic. */ + Loops are ignored. Depends loop entry points are chaotic. */ bool pkgOrderList::DepConfigure(DepIterator D) { // Never consider reverse configuration dependencies. diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 90dd3a3ee..a8537431b 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -135,7 +135,7 @@ bool pkgPackageManager::FixMissing() return Resolve.ResolveByKeep() == true && Cache.BrokenCount() == 0; } /*}}}*/ -// PM::ImmediateAdd - Add the immediate flag recursivly /*{{{*/ +// PM::ImmediateAdd - Add the immediate flag recursively /*{{{*/ // --------------------------------------------------------------------- /* This adds the immediate flag to the pkg and recursively to the dependencies @@ -806,7 +806,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c break; } - // check if it needs unpack or if if configure is enough + // check if it needs unpack or if configure is enough if (List->IsFlag(DepPkg,pkgOrderList::UnPacked) == false) { // two packages pre-depending on each other can't be handled sanely @@ -1015,7 +1015,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c return false; if (Immediate == true) { - // Perform immedate configuration of the package. + // Perform immediate configuration of the package. if (SmartConfigure(Pkg, Depth + 1) == false) _error->Error(_("Could not perform immediate configuration on '%s'. " "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),2); diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index 5046e2dc0..e4c7a0a0a 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -7,7 +7,7 @@ Three steps are - Aquiration of archives (stores the list of final file names) - Sorting of operations - - Invokation of package manager + - Invocation of package manager This is the final stage when the package cache entities get converted into file names and the state stored in a DepCache is transformed diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 1705f836b..c5ed1b916 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -613,8 +613,8 @@ bool pkgCache::DepIterator::IsNegative() const /* This intellegently looks at dep target packages and tries to figure out which package should be used. This is needed to nicely handle provide mapping. If the target package has no other providing packages - then it returned. Otherwise the providing list is looked at to - see if there is one one unique providing package if so it is returned. + then it returned. Otherwise the providing list is looked at to + see if there is one unique providing package if so it is returned. Otherwise true is returned and the target package is set. The return result indicates whether the node should be expandable diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 1b4c89f84..678b5f660 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -1402,24 +1402,27 @@ public: ScopedErrorRevert() { _error->PushToStack(); } ~ScopedErrorRevert() { _error->RevertToStack(); } }; -static bool CheckValidity(const string &CacheFile, +static bool CheckValidity(FileFd &CacheFile, std::string const &CacheFileName, pkgSourceList &List, FileIterator const Start, FileIterator const End, MMap **OutMap = 0, pkgCache **OutCache = 0) { + if (CacheFileName.empty()) + return false; ScopedErrorRevert ser; + bool const Debug = _config->FindB("Debug::pkgCacheGen", false); // No file, certainly invalid - if (CacheFile.empty() == true || FileExists(CacheFile) == false) + if (CacheFile.Open(CacheFileName, FileFd::ReadOnly, FileFd::None) == false) { if (Debug == true) - std::clog << "CacheFile " << CacheFile << " doesn't exist" << std::endl; + std::clog << "CacheFile " << CacheFileName << " doesn't exist" << std::endl; return false; } - if (List.GetLastModifiedTime() > GetModificationTime(CacheFile)) + if (List.GetLastModifiedTime() > CacheFile.ModificationTime()) { if (Debug == true) std::clog << "sources.list is newer than the cache" << std::endl; @@ -1427,8 +1430,7 @@ static bool CheckValidity(const string &CacheFile, } // Map it - FileFd CacheF(CacheFile,FileFd::ReadOnly); - std::unique_ptr<MMap> Map(new MMap(CacheF,0)); + std::unique_ptr<MMap> Map(new MMap(CacheFile,0)); if (unlikely(Map->validData()) == false) return false; std::unique_ptr<pkgCache> CacheP(new pkgCache(Map.get())); @@ -1436,8 +1438,8 @@ static bool CheckValidity(const string &CacheFile, if (_error->PendingError() || Map->Size() == 0) { if (Debug == true) - std::clog << "Errors are pending or Map is empty() for " << CacheFile << std::endl; - return _error->ReturnError(); + std::clog << "Errors are pending or Map is empty() for " << CacheFileName << std::endl; + return false; } std::unique_ptr<bool[]> RlsVisited(new bool[Cache.HeaderP->ReleaseFileCount]); @@ -1659,13 +1661,12 @@ static bool writeBackMMapToFile(pkgCacheGenerator * const Gen, DynamicMMap * con return true; } static bool loadBackMMapFromFile(std::unique_ptr<pkgCacheGenerator> &Gen, - std::unique_ptr<DynamicMMap> &Map, OpProgress * const Progress, std::string const &FileName) + std::unique_ptr<DynamicMMap> &Map, OpProgress * const Progress, FileFd &CacheF) { Map.reset(CreateDynamicMMap(NULL, 0)); if (unlikely(Map->validData()) == false) return false; - FileFd CacheF(FileName, FileFd::ReadOnly); - if (CacheF.IsOpen() == false || CacheF.Failed()) + if (CacheF.IsOpen() == false || CacheF.Seek(0) == false || CacheF.Failed()) return false; _error->PushToStack(); map_pointer_t const alloc = Map->RawAllocate(CacheF.Size()); @@ -1697,20 +1698,20 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress return false; // Decide if we can write to the files.. - string const CacheFile = _config->FindFile("Dir::Cache::pkgcache"); - string const SrcCacheFile = _config->FindFile("Dir::Cache::srcpkgcache"); + string const CacheFileName = _config->FindFile("Dir::Cache::pkgcache"); + string const SrcCacheFileName = _config->FindFile("Dir::Cache::srcpkgcache"); // ensure the cache directory exists - if (CacheFile.empty() == false || SrcCacheFile.empty() == false) + if (CacheFileName.empty() == false || SrcCacheFileName.empty() == false) { string dir = _config->FindDir("Dir::Cache"); size_t const len = dir.size(); if (len > 5 && dir.find("/apt/", len - 6, 5) == len - 5) dir = dir.substr(0, len - 5); - if (CacheFile.empty() == false) - CreateDirectory(dir, flNotFile(CacheFile)); - if (SrcCacheFile.empty() == false) - CreateDirectory(dir, flNotFile(SrcCacheFile)); + if (CacheFileName.empty() == false) + CreateDirectory(dir, flNotFile(CacheFileName)); + if (SrcCacheFileName.empty() == false) + CreateDirectory(dir, flNotFile(SrcCacheFileName)); } if (Progress != NULL) @@ -1719,8 +1720,8 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress bool pkgcache_fine = false; bool srcpkgcache_fine = false; bool volatile_fine = List.GetVolatileFiles().empty(); - - if (CheckValidity(CacheFile, List, Files.begin(), Files.end(), volatile_fine ? OutMap : NULL, + FileFd CacheFile; + if (CheckValidity(CacheFile, CacheFileName, List, Files.begin(), Files.end(), volatile_fine ? OutMap : NULL, volatile_fine ? OutCache : NULL) == true) { if (Debug == true) @@ -1728,9 +1729,11 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress pkgcache_fine = true; srcpkgcache_fine = true; } + + FileFd SrcCacheFile; if (pkgcache_fine == false) { - if (CheckValidity(SrcCacheFile, List, Files.end(), Files.end()) == true) + if (CheckValidity(SrcCacheFile, SrcCacheFileName, List, Files.end(), Files.end()) == true) { if (Debug == true) std::clog << "srcpkgcache.bin is valid - it can be reused" << std::endl; @@ -1748,10 +1751,10 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress bool Writeable = false; if (srcpkgcache_fine == false || pkgcache_fine == false) { - if (CacheFile.empty() == false) - Writeable = access(flNotFile(CacheFile).c_str(),W_OK) == 0; - else if (SrcCacheFile.empty() == false) - Writeable = access(flNotFile(SrcCacheFile).c_str(),W_OK) == 0; + if (CacheFileName.empty() == false) + Writeable = access(flNotFile(CacheFileName).c_str(),W_OK) == 0; + else if (SrcCacheFileName.empty() == false) + Writeable = access(flNotFile(SrcCacheFileName).c_str(),W_OK) == 0; if (Debug == true) std::clog << "Do we have write-access to the cache files? " << (Writeable ? "YES" : "NO") << std::endl; @@ -1789,8 +1792,8 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress BuildCache(*Gen, Progress, CurrentSize, TotalSize, &List, Files.end(),Files.end()); - if (Writeable == true && SrcCacheFile.empty() == false) - if (writeBackMMapToFile(Gen.get(), Map.get(), SrcCacheFile) == false) + if (Writeable == true && SrcCacheFileName.empty() == false) + if (writeBackMMapToFile(Gen.get(), Map.get(), SrcCacheFileName) == false) return false; } @@ -1801,8 +1804,8 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress BuildCache(*Gen, Progress, CurrentSize, TotalSize, NULL, Files.begin(), Files.end()); - if (Writeable == true && CacheFile.empty() == false) - if (writeBackMMapToFile(Gen.get(), Map.get(), CacheFile) == false) + if (Writeable == true && CacheFileName.empty() == false) + if (writeBackMMapToFile(Gen.get(), Map.get(), CacheFileName) == false) return false; } diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index b5eec305e..5d4ba37d7 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -10,7 +10,7 @@ package files. This is different than the generators parser in that it is used to access information not generate information. No information touched by the generator should be parable from here as - it can always be retreived directly from the cache. + it can always be retrieved directly from the cache. ##################################################################### */ /*}}}*/ diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h index 04747c5a1..943332bbb 100644 --- a/apt-pkg/policy.h +++ b/apt-pkg/policy.h @@ -8,7 +8,7 @@ standard 'Version 0' engine is included inside the DepCache which is it's historical location. - The V4 engine allows the user to completly control all aspects of + The V4 engine allows the user to completely control all aspects of version selection. There are three primary means to choose a version * Selection by version match * Selection by Release file match diff --git a/apt-pkg/tagfile-order.c b/apt-pkg/tagfile-order.c index a7625b501..0347d8b76 100644 --- a/apt-pkg/tagfile-order.c +++ b/apt-pkg/tagfile-order.c @@ -17,6 +17,7 @@ static const char *iTFRewritePackageOrder[] = { "Kernel-Version", // Used only by d-i "Built-Using", "Built-For-Profiles", + "Auto-Built-Package", "Multi-Arch", "Status", "Priority", diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 4c2a8b6b8..943575956 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -805,7 +805,7 @@ bool TFRewrite(FILE *Output,pkgTagSection const &Tags,const char *Order[], Rewrite[J].NewTag = Rewrite[J].Tag; } - // Write all all of the tags, in order. + // Write all of the tags, in order. if (Order != NULL) { for (unsigned int I = 0; Order[I] != 0; I++) diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index a788e1044..04e20a5e8 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -146,7 +146,7 @@ class pkgTagSection /** \brief amount of Tags in the current section * - * Note: if a Tag is mentioned repeatly it will be counted multiple + * Note: if a Tag is mentioned repeatedly it will be counted multiple * times, but only the last occurrence is available via Find methods. */ unsigned int Count() const; diff --git a/apt-pkg/update.h b/apt-pkg/update.h index e35cd14f6..559516f1b 100644 --- a/apt-pkg/update.h +++ b/apt-pkg/update.h @@ -2,8 +2,8 @@ // Description /*{{{*/ /* ###################################################################### - Update - ListUpdate releated code - + Update - ListUpdate related code + ##################################################################### */ /*}}}*/ diff --git a/apt-pkg/upgrade.cc b/apt-pkg/upgrade.cc index afc9ad613..a61789c11 100644 --- a/apt-pkg/upgrade.cc +++ b/apt-pkg/upgrade.cc @@ -210,7 +210,7 @@ static bool pkgAllUpgradeWithNewPackages(pkgDepCache &Cache, OpProgress * const if (Progress != NULL) Progress->Progress(50); - // ... but it may remove stuff, we we need to clean up afterwards again + // ... but it may remove stuff, we need to clean up afterwards again for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I) if (Cache[I].Delete() == true) Cache.MarkKeep(I, false, false); diff --git a/apt-pkg/upgrade.h b/apt-pkg/upgrade.h index 71dbb4fd3..2d9c0fa36 100644 --- a/apt-pkg/upgrade.h +++ b/apt-pkg/upgrade.h @@ -2,8 +2,8 @@ // Description /*{{{*/ /* ###################################################################### - Upgrade - Upgrade/DistUpgrade releated code - + Upgrade - Upgrade/DistUpgrade related code + ##################################################################### */ /*}}}*/ diff --git a/apt-private/CMakeLists.txt b/apt-private/CMakeLists.txt index 6de9e0281..5dda36c92 100644 --- a/apt-private/CMakeLists.txt +++ b/apt-private/CMakeLists.txt @@ -2,7 +2,9 @@ set(MAJOR 0.0) set(MINOR 0) -# Definition of the C++ files used to build the library +# Definition of the C++ files used to build the library - note that this +# is expanded at CMake time, so you have to rerun cmake if you add or remove +# a file (you can just run cmake . in the build directory) file(GLOB_RECURSE library "*.cc") file(GLOB_RECURSE headers "*.h") diff --git a/apt-private/private-cachefile.cc b/apt-private/private-cachefile.cc index 32cad1c33..77090f8eb 100644 --- a/apt-private/private-cachefile.cc +++ b/apt-private/private-cachefile.cc @@ -108,10 +108,9 @@ bool CacheFile::CheckDeps(bool AllowBroken) } else { - c1out << _("You might want to run 'apt-get -f install' to correct these.") << endl; + c1out << _("You might want to run 'apt --fix-broken install' to correct these.") << endl; ShowBroken(c1out,*this,true); - - return _error->Error(_("Unmet dependencies. Try using -f.")); + return _error->Error(_("Unmet dependencies. Try 'apt --fix-broken install' with no packages (or specify a solution).")); } return true; diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index d0cda08a6..de3992a00 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -220,6 +220,8 @@ static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const addArg('P', "build-profiles", "APT::Build-Profiles", CommandLine::HasArg); addArg(0, "purge", "APT::Get::Purge", 0); addArg(0, "solver", "APT::Solver", CommandLine::HasArg); + addArg(0,"arch-only","APT::Get::Arch-Only",0); + addArg(0,"indep-only","APT::Get::Indep-Only",0); // this has no effect *but* sbuild is using it (see LP: #1255806) // once sbuild is fixed, this option can be removed addArg('f', "fix-broken", "APT::Get::Fix-Broken", 0); @@ -270,7 +272,6 @@ static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const addArg(0,"trivial-only","APT::Get::Trivial-Only",0); addArg(0,"remove","APT::Get::Remove",0); addArg(0,"only-source","APT::Get::Only-Source",0); - addArg(0,"arch-only","APT::Get::Arch-Only",0); addArg(0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0); addArg(0,"allow-insecure-repositories","Acquire::AllowInsecureRepositories",0); addArg(0,"allow-weak-repositories","Acquire::AllowWeakRepositories",0); @@ -473,6 +474,16 @@ static void BinaryCommandSpecificConfiguration(char const * const Binary, char c std::string const binary = flNotDir(Binary); if (binary == "apt-get" && CmdMatches("update")) _config->CndSet("Binary::apt-get::Acquire::AllowInsecureRepositories", true); + if ((binary == "apt" || binary == "apt-get") && CmdMatches("upgrade", "dist-upgrade", "full-upgrade")) + { + //FIXME: the option is documented to apply only for install/remove, so + // we force it false for configuration files where users can be confused if + // we support it anyhow, but allow it on the commandline to take effect + // even through it isn't documented as a user who doesn't want it wouldn't + // ask for it + _config->Set("Binary::apt-get::APT::Get::AutomaticRemove", false); + _config->Set("Binary::apt::APT::Get::AutomaticRemove", false); + } } #undef CmdMatches /*}}}*/ @@ -500,9 +511,6 @@ std::vector<CommandLine::Dispatch> ParseCommandLine(CommandLine &CmdL, APT_CMD c for (auto const& cmd : CmdsWithHelp) Cmds.push_back({cmd.Match, cmd.Handler}); - // Args running out of scope invalidates the pointer stored in CmdL, - // but we don't use the pointer after this function, so we ignore - // this problem for now and figure something out if we have to. char const * CmdCalled = nullptr; if (Cmds.empty() == false && Cmds[0].Handler != nullptr) CmdCalled = CommandLine::GetCommand(Cmds.data(), argc, argv); @@ -510,6 +518,10 @@ std::vector<CommandLine::Dispatch> ParseCommandLine(CommandLine &CmdL, APT_CMD c BinaryCommandSpecificConfiguration(argv[0], CmdCalled); std::string const conf = "Binary::" + _config->Find("Binary"); _config->MoveSubTree(conf.c_str(), nullptr); + + // Args running out of scope invalidates the pointer stored in CmdL, + // but we don't use the pointer after this function, so we ignore + // this problem for now and figure something out if we have to. auto Args = getCommandArgs(Binary, CmdCalled); CmdL = CommandLine(Args.data(), _config); diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc index d0cbbcf50..ee477f4cb 100644 --- a/apt-private/private-download.cc +++ b/apt-private/private-download.cc @@ -367,7 +367,7 @@ bool DoAutoClean(CommandLine &) } CacheFile Cache; - if (Cache.Open() == false) + if (Cache.Open(false) == false) return false; LogCleaner Cleaner; diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc index 761e4d175..73a03a828 100644 --- a/apt-private/private-install.cc +++ b/apt-private/private-install.cc @@ -136,16 +136,19 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety) _error->PendingError() == true) return false; - if (_config->FindB("APT::Get::Fix-Missing",false) == true && - _config->FindB("APT::Get::Download",true) == false) + if (_config->FindB("APT::Get::Download",true) == false) { bool Missing = false; RemoveDownloadNeedingItemsFromFetcher(Fetcher, Missing); if (Missing) - PM->FixMissing(); + { + if (_config->FindB("APT::Get::Fix-Missing",false)) + PM->FixMissing(); + else + return _error->Error(_("Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?")); + } Fetcher.Shutdown(); - if (PM->GetArchives(&Fetcher,List,&Recs) == false || - _error->PendingError() == true) + if (_error->PendingError() == true) return false; } @@ -396,7 +399,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety) /* Remove unused automatic packages */ bool DoAutomaticRemove(CacheFile &Cache) { - bool Debug = _config->FindI("Debug::pkgAutoRemove",false); + bool Debug = _config->FindB("Debug::pkgAutoRemove",false); bool doAutoRemove = _config->FindB("APT::Get::AutomaticRemove", false); bool hideAutoRemove = _config->FindB("APT::Get::HideAutoRemove"); @@ -657,9 +660,9 @@ bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<std::stri packages */ if (BrokenFix == true && Cache->BrokenCount() != 0) { - c1out << _("You might want to run 'apt-get -f install' to correct these:") << std::endl; + c1out << _("You might want to run 'apt --fix-broken install' to correct these.") << std::endl; ShowBroken(c1out,Cache,false); - return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution).")); + return _error->Error(_("Unmet dependencies. Try 'apt --fix-broken install' with no packages (or specify a solution).")); } if (Fix != NULL) diff --git a/apt-private/private-moo.cc b/apt-private/private-moo.cc index a87999150..b8ed6efbd 100644 --- a/apt-private/private-moo.cc +++ b/apt-private/private-moo.cc @@ -15,6 +15,7 @@ #include <apt-private/private-moo.h> #include <apt-private/private-output.h> +#include <apt-private/private-utils.h> #include <stddef.h> #include <string.h> @@ -26,8 +27,8 @@ #include <apti18n.h> /*}}}*/ -static std::string getMooLine() { /*{{{*/ - time_t const timenow = time(NULL); +static std::string getMooLine(time_t const timenow) /*{{{*/ +{ struct tm special; localtime_r(&timenow, &special); enum { NORMAL, PACKAGEMANAGER, APPRECIATION, AGITATION, AIRBORN } line; @@ -64,17 +65,18 @@ static std::string getMooLine() { /*{{{*/ return out.str(); } /*}}}*/ -static bool printMooLine() { /*{{{*/ - std::cerr << getMooLine() << std::endl; +static bool printMooLine(time_t const timenow) /*{{{*/ +{ + std::cerr << getMooLine(timenow); return true; } /*}}}*/ -bool DoMoo1(CommandLine &) /*{{{*/ +static bool DoMoo1(time_t const timenow) /*{{{*/ { // our trustworthy super cow since 2001 if (_config->FindI("quiet") >= 2) - return printMooLine(); - std::string const moo = getMooLine(); + return printMooLine(timenow); + std::string const moo = getMooLine(timenow); size_t const depth = moo.length()/4; c1out << OutputInDepth(depth, " ") << " (__) \n" << @@ -87,12 +89,12 @@ bool DoMoo1(CommandLine &) /*{{{*/ return true; } /*}}}*/ -bool DoMoo2(CommandLine &) /*{{{*/ +static bool DoMoo2(time_t const timenow) /*{{{*/ { // by Fernando Ribeiro in lp:56125 if (_config->FindI("quiet") >= 2) - return printMooLine(); - std::string const moo = getMooLine(); + return printMooLine(timenow); + std::string const moo = getMooLine(timenow); size_t const depth = moo.length()/4; if (_config->FindB("APT::Moo::Color", false) == false) c1out << @@ -121,12 +123,12 @@ bool DoMoo2(CommandLine &) /*{{{*/ return true; } /*}}}*/ -bool DoMoo3(CommandLine &) /*{{{*/ +static bool DoMoo3(time_t const timenow) /*{{{*/ { // by Robert Millan in deb:134156 if (_config->FindI("quiet") >= 2) - return printMooLine(); - std::string const moo = getMooLine(); + return printMooLine(timenow); + std::string const moo = getMooLine(timenow); size_t const depth = moo.length()/16; c1out << OutputInDepth(depth, " ") << " \\_/ \n" << @@ -138,7 +140,7 @@ bool DoMoo3(CommandLine &) /*{{{*/ return true; } /*}}}*/ -bool DoMooApril(CommandLine &) /*{{{*/ +static bool DoMooApril() /*{{{*/ { // by Christopher Allan Webber and proposed by Paul Tagliamonte // in a "Community outreach": https://lists.debian.org/debian-devel/2013/04/msg00045.html @@ -163,11 +165,12 @@ bool DoMooApril(CommandLine &) /*{{{*/ /*}}}*/ bool DoMoo(CommandLine &CmdL) /*{{{*/ { - time_t const timenow = time(NULL); + time_t const timenow = GetSecondsSinceEpoch(); + struct tm april; localtime_r(&timenow, &april); if (april.tm_mday == 1 && april.tm_mon == 3) - return DoMooApril(CmdL); + return DoMooApril(); signed short SuperCow = 1; if (CmdL.FileSize() != 0) @@ -185,11 +188,11 @@ bool DoMoo(CommandLine &CmdL) /*{{{*/ } switch(SuperCow) { - case 1: return DoMoo1(CmdL); - case 2: return DoMoo2(CmdL); - case 3: return DoMoo3(CmdL); - case 4: return DoMooApril(CmdL); - default: return DoMoo1(CmdL); + case 1: return DoMoo1(timenow); + case 2: return DoMoo2(timenow); + case 3: return DoMoo3(timenow); + case 4: return DoMooApril(); + default: return DoMoo1(timenow); } return true; diff --git a/apt-private/private-moo.h b/apt-private/private-moo.h index bc8b3e7dd..c230ce2e1 100644 --- a/apt-private/private-moo.h +++ b/apt-private/private-moo.h @@ -6,9 +6,5 @@ class CommandLine; APT_PUBLIC bool DoMoo(CommandLine &CmdL); -bool DoMoo1(CommandLine &CmdL); -bool DoMoo2(CommandLine &CmdL); -bool DoMoo3(CommandLine &CmdL); -bool DoMooApril(CommandLine &CmdL); #endif diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index 301aa5519..9c25cda6d 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -304,14 +304,14 @@ void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, /*{{{*/ // ShowBroken - Debugging aide /*{{{*/ // --------------------------------------------------------------------- /* This prints out the names of all the packages that are broken along - with the name of each each broken dependency and a quite version + with the name of each broken dependency and a quite version description. - + The output looks like: The following packages have unmet dependencies: exim: Depends: libc6 (>= 2.1.94) but 2.1.3-10 is to be installed Depends: libldap2 (>= 2.0.2-2) but it is not going to be installed - Depends: libsasl7 but it is not going to be installed + Depends: libsasl7 but it is not going to be installed */ static void ShowBrokenPackage(ostream &out, pkgCacheFile * const Cache, pkgCache::PkgIterator const &Pkg, bool const Now) { diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc index 9e7951ed2..923ea4db1 100644 --- a/apt-private/private-source.cc +++ b/apt-private/private-source.cc @@ -306,7 +306,7 @@ static pkgSrcRecords::Parser *FindSrc(const char *Name, /*}}}*/ // DoSource - Fetch a source archive /*{{{*/ // --------------------------------------------------------------------- -/* Fetch souce packages */ +/* Fetch source packages */ struct DscFile { std::string Package; @@ -328,7 +328,8 @@ bool DoSource(CommandLine &CmdL) if (_error->PendingError() == true) return false; - std::unique_ptr<DscFile[]> Dsc(new DscFile[CmdL.FileSize()]); + std::vector<DscFile> Dsc; + Dsc.reserve(CmdL.FileSize()); // insert all downloaded uris into this set to avoid downloading them // twice @@ -343,9 +344,8 @@ bool DoSource(CommandLine &CmdL) // Load the requestd sources into the fetcher aptAcquireWithTextStatus Fetcher; - unsigned J = 0; std::vector<std::string> UntrustedList; - for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++) + for (const char **I = CmdL.FileList + 1; *I != 0; I++) { std::string Src; pkgSrcRecords::Parser *Last = FindSrc(*I,SrcRecs,Src,Cache); @@ -394,6 +394,7 @@ bool DoSource(CommandLine &CmdL) return false; } + DscFile curDsc; // Load them into the fetcher for (std::vector<pkgSrcRecords::File2>::const_iterator I = Lst.begin(); I != Lst.end(); ++I) @@ -401,9 +402,9 @@ bool DoSource(CommandLine &CmdL) // Try to guess what sort of file it is we are getting. if (I->Type == "dsc") { - Dsc[J].Package = Last->Package(); - Dsc[J].Version = Last->Version(); - Dsc[J].Dsc = flNotDir(I->Path); + curDsc.Package = Last->Package(); + curDsc.Version = Last->Version(); + curDsc.Dsc = flNotDir(I->Path); } // Handle the only options so that multiple can be used at once @@ -438,13 +439,14 @@ bool DoSource(CommandLine &CmdL) { ioprintf(c1out, "Skipping download of file '%s' as requested hashsum is not available for authentication\n", localFile.c_str()); - Dsc[J].Dsc.clear(); + curDsc.Dsc.clear(); continue; } new pkgAcqFile(&Fetcher,Last->Index().ArchiveURI(I->Path), I->Hashes, I->FileSize, Last->Index().SourceInfo(*Last,*I), Src); } + Dsc.push_back(std::move(curDsc)); } // Display statistics @@ -469,8 +471,8 @@ bool DoSource(CommandLine &CmdL) if (_config->FindB("APT::Get::Simulate",false) == true) { - for (unsigned I = 0; I != J; I++) - ioprintf(std::cout,_("Fetch source %s\n"),Dsc[I].Package.c_str()); + for (auto const &D: Dsc) + ioprintf(std::cout, _("Fetch source %s\n"), D.Package.c_str()); return true; } @@ -491,89 +493,79 @@ bool DoSource(CommandLine &CmdL) // Run it bool Failed = false; if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true) - { return _error->Error(_("Failed to fetch some archives.")); - } - if (_config->FindB("APT::Get::Download-only",false) == true) + if (diffOnly || tarOnly || dscOnly || _config->FindB("APT::Get::Download-only",false) == true) { c1out << _("Download complete and in download only mode") << std::endl; return true; } - // Unpack the sources - pid_t Process = ExecFork(); - - if (Process == 0) + bool const fixBroken = _config->FindB("APT::Get::Fix-Broken", false); + bool SaidCheckIfDpkgDev = false; + for (auto const &D: Dsc) { - bool const fixBroken = _config->FindB("APT::Get::Fix-Broken", false); - for (unsigned I = 0; I != J; ++I) + if (unlikely(D.Dsc.empty() == true)) + continue; + std::string const Dir = D.Package + '-' + Cache.GetPkgCache()->VS->UpstreamVersion(D.Version.c_str()); + + // See if the package is already unpacked + struct stat Stat; + if (fixBroken == false && stat(Dir.c_str(),&Stat) == 0 && + S_ISDIR(Stat.st_mode) != 0) { - std::string Dir = Dsc[I].Package + '-' + Cache.GetPkgCache()->VS->UpstreamVersion(Dsc[I].Version.c_str()); - - // Diff only mode only fetches .diff files - if (_config->FindB("APT::Get::Diff-Only",false) == true || - _config->FindB("APT::Get::Tar-Only",false) == true || - Dsc[I].Dsc.empty() == true) - continue; - - // See if the package is already unpacked - struct stat Stat; - if (fixBroken == false && stat(Dir.c_str(),&Stat) == 0 && - S_ISDIR(Stat.st_mode) != 0) - { - ioprintf(c0out ,_("Skipping unpack of already unpacked source in %s\n"), - Dir.c_str()); - } - else + ioprintf(c0out ,_("Skipping unpack of already unpacked source in %s\n"), + Dir.c_str()); + } + else + { + // Call dpkg-source + std::string const sourceopts = _config->Find("DPkg::Source-Options", "--no-check -x"); + std::string S; + strprintf(S, "%s %s %s", + _config->Find("Dir::Bin::dpkg-source","dpkg-source").c_str(), + sourceopts.c_str(), D.Dsc.c_str()); + if (RunCmd(S.c_str()) != 0) { - // Call dpkg-source - std::string const sourceopts = _config->Find("DPkg::Source-Options", "-x"); - std::string S; - strprintf(S, "%s %s %s", - _config->Find("Dir::Bin::dpkg-source","dpkg-source").c_str(), - sourceopts.c_str(), Dsc[I].Dsc.c_str()); - if (RunCmd(S.c_str()) != 0) + _error->Error(_("Unpack command '%s' failed.\n"), S.c_str()); + if (SaidCheckIfDpkgDev == false) { - fprintf(stderr, _("Unpack command '%s' failed.\n"), S.c_str()); - fprintf(stderr, _("Check if the 'dpkg-dev' package is installed.\n")); - _exit(1); + _error->Notice(_("Check if the 'dpkg-dev' package is installed.\n")); + SaidCheckIfDpkgDev = true; } + continue; } + } - // Try to compile it with dpkg-buildpackage - if (_config->FindB("APT::Get::Compile",false) == true) - { - std::string buildopts = _config->Find("APT::Get::Host-Architecture"); - if (buildopts.empty() == false) - buildopts = "-a" + buildopts + " "; + // Try to compile it with dpkg-buildpackage + if (_config->FindB("APT::Get::Compile",false) == true) + { + std::string buildopts = _config->Find("APT::Get::Host-Architecture"); + if (buildopts.empty() == false) + buildopts = "-a" + buildopts + " "; - // get all active build profiles - std::string const profiles = APT::Configuration::getBuildProfilesString(); - if (profiles.empty() == false) - buildopts.append(" -P").append(profiles).append(" "); + // get all active build profiles + std::string const profiles = APT::Configuration::getBuildProfilesString(); + if (profiles.empty() == false) + buildopts.append(" -P").append(profiles).append(" "); - buildopts.append(_config->Find("DPkg::Build-Options","-b -uc")); + buildopts.append(_config->Find("DPkg::Build-Options","-b -uc")); - // Call dpkg-buildpackage - std::string S; - strprintf(S, "cd %s && %s %s", - Dir.c_str(), - _config->Find("Dir::Bin::dpkg-buildpackage","dpkg-buildpackage").c_str(), - buildopts.c_str()); + // Call dpkg-buildpackage + std::string S; + strprintf(S, "cd %s && %s %s", + Dir.c_str(), + _config->Find("Dir::Bin::dpkg-buildpackage","dpkg-buildpackage").c_str(), + buildopts.c_str()); - if (RunCmd(S.c_str()) != 0) - { - fprintf(stderr, _("Build command '%s' failed.\n"), S.c_str()); - _exit(1); - } + if (RunCmd(S.c_str()) != 0) + { + _error->Error(_("Build command '%s' failed.\n"), S.c_str()); + continue; } } - - _exit(0); } - - return ExecWait(Process, "dpkg-source"); + return true; } /*}}}*/ // DoBuildDep - Install/removes packages to satisfy build dependencies /*{{{*/ @@ -616,9 +608,14 @@ static void WriteBuildDependencyPackage(std::ostringstream &buildDepsPkgFile, << "Architecture: " << Arch << "\n" << "Version: 1\n"; + bool const IndepOnly = _config->FindB("APT::Get::Indep-Only", false); std::string depends, conflicts; for (auto const &dep: Dependencies) { + // ArchOnly is handled while parsing the dependencies on input + if (IndepOnly && (dep.Type == pkgSrcRecords::Parser::BuildDependArch || + dep.Type == pkgSrcRecords::Parser::BuildConflictArch)) + continue; std::string * type; if (dep.Type == pkgSrcRecords::Parser::BuildConflict || dep.Type == pkgSrcRecords::Parser::BuildConflictIndep || @@ -671,16 +668,12 @@ bool DoBuildDep(CommandLine &CmdL) // deal with the build essentials first { std::vector<pkgSrcRecords::Parser::BuildDepRec> BuildDeps; - Configuration::Item const *Opts = _config->Tree("APT::Build-Essential"); - if (Opts) - Opts = Opts->Child; - for (; Opts; Opts = Opts->Next) + for (auto && opt: _config->FindVector("APT::Build-Essential")) { - if (Opts->Value.empty() == true) + if (opt.empty()) continue; - pkgSrcRecords::Parser::BuildDepRec rec; - rec.Package = Opts->Value; + rec.Package = std::move(opt); rec.Type = pkgSrcRecords::Parser::BuildDependIndep; rec.Op = 0; BuildDeps.push_back(rec); diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc index ba953a088..a886c830f 100644 --- a/apt-private/private-update.cc +++ b/apt-private/private-update.cc @@ -71,19 +71,19 @@ bool DoUpdate(CommandLine &CmdL) ListUpdate(Stat, *List); } + if (_config->FindB("pkgCacheFile::Generate", true) == false) + return true; + // Rebuild the cache. - if (_config->FindB("pkgCacheFile::Generate", true) == true) - { - pkgCacheFile::RemoveCaches(); - if (Cache.BuildCaches() == false) - return false; - } + pkgCacheFile::RemoveCaches(); + if (Cache.BuildCaches(false) == false) + return false; // show basic stats (if the user whishes) if (_config->FindB("APT::Cmd::Show-Update-Stats", false) == true) { int upgradable = 0; - if (Cache.Open() == false) + if (Cache.Open(false) == false) return false; for (pkgCache::PkgIterator I = Cache->PkgBegin(); I.end() != true; ++I) { diff --git a/apt-private/private-utils.cc b/apt-private/private-utils.cc index 775bf7e79..5863925b9 100644 --- a/apt-private/private-utils.cc +++ b/apt-private/private-utils.cc @@ -1,11 +1,13 @@ #include <config.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> #include <apt-private/private-utils.h> #include <cstdlib> +#include <sstream> #include <unistd.h> // DisplayFileInPager - Display File with pager /*{{{*/ @@ -74,3 +76,23 @@ bool EditFileInSensibleEditor(std::string const &filename) return ExecWait(Process, "editor", false); } /*}}}*/ +time_t GetSecondsSinceEpoch() /*{{{*/ +{ + auto const source_date_epoch = getenv("SOURCE_DATE_EPOCH"); + if (source_date_epoch == nullptr) + return time(nullptr); + + time_t epoch; + std::stringstream ss(source_date_epoch); + ss >> epoch; + + if (ss.fail() || !ss.eof()) + { + _error->Warning("Environment variable SOURCE_DATE_EPOCH was ignored as it has an invalid value: \"%s\"", + source_date_epoch); + return time(nullptr); + } + + return epoch; +} + /*}}}*/ diff --git a/apt-private/private-utils.h b/apt-private/private-utils.h index b3b249689..4d48bd1ba 100644 --- a/apt-private/private-utils.h +++ b/apt-private/private-utils.h @@ -5,5 +5,6 @@ bool DisplayFileInPager(std::string const &filename); bool EditFileInSensibleEditor(std::string const &filename); +time_t GetSecondsSinceEpoch(); #endif diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in index c9ff4b3f4..723af06ff 100644 --- a/cmdline/apt-key.in +++ b/cmdline/apt-key.in @@ -1,7 +1,7 @@ #!/bin/sh set -e -unset GREP_OPTIONS +unset GREP_OPTIONS GPGHOMEDIR CURRENTTRAP export IFS="$(printf "\n\b")" MASTER_KEYRING='&keyring-master-filename;' @@ -526,6 +526,11 @@ while [ -n "$1" ]; do # … other more complicated ones pipe gpg into gpg. aptkey_execute() { echo >&2 'EXEC:' "$@"; sh "$@"; } ;; + --homedir) + # force usage of a specific homedir instead of creating a temporary + shift + GPGHOMEDIR="$1" + ;; --*) echo >&2 "Unknown option: $1" usage @@ -593,9 +598,13 @@ cleanup_gpg_home() { rm -rf "$GPGHOMEDIR" } +# gpg needs (in different versions more or less) files to function correctly, +# so we give it its own homedir and generate some valid content for it later on create_gpg_home() { - # gpg needs (in different versions more or less) files to function correctly, - # so we give it its own homedir and generate some valid content for it later on + # for cases in which we want to cache a homedir due to expensive setup + if [ -n "$GPGHOMEDIR" ]; then + return + fi if [ -n "$TMPDIR" ]; then # tmpdir is a directory and current user has rwx access to it # same tests as in apt-pkg/contrib/fileutl.cc GetTempDir() @@ -603,7 +612,7 @@ create_gpg_home() { unset TMPDIR fi fi - GPGHOMEDIR="$(mktemp -d)" + GPGHOMEDIR="$(mktemp --directory --tmpdir 'apt-key-gpghome.XXXXXXXXXX')" CURRENTTRAP="${CURRENTTRAP} cleanup_gpg_home;" trap "${CURRENTTRAP}" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM if [ -z "$GPGHOMEDIR" ]; then @@ -644,6 +653,13 @@ EOF create_gpg_home + # now tell gpg that it shouldn't try to maintain this trustdb file + echo "#!/bin/sh +exec '$(escape_shell "${GPG_EXE}")' --ignore-time-conflict --no-options --no-default-keyring \\ +--homedir '$(escape_shell "${GPGHOMEDIR}")' --no-auto-check-trustdb --trust-model always \"\$@\"" > "${GPGHOMEDIR}/gpg.0.sh" + GPG_SH="${GPGHOMEDIR}/gpg.0.sh" + GPG="$GPG_SH" + # create the trustdb with an (empty) dummy keyring # older gpgs required it, newer gpgs even warn that it isn't needed, # but require it nonetheless for some commands, so we just play safe @@ -655,19 +671,15 @@ EOF false fi - # now tell gpg that it shouldn't try to maintain this trustdb file - echo "#!/bin/sh -exec '$(escape_shell "${GPG_EXE}")' --ignore-time-conflict --no-options --no-default-keyring \\ ---homedir '$(escape_shell "${GPGHOMEDIR}")' --no-auto-check-trustdb --trust-model always \"\$@\"" > "${GPGHOMEDIR}/gpg.0.sh" - GPG_SH="${GPGHOMEDIR}/gpg.0.sh" - GPG="$GPG_SH" - # We don't usually need a secret keyring, of course, but # for advanced operations, we might really need a secret keyring after all if [ -n "$FORCED_SECRET_KEYRING" ] && [ -r "$FORCED_SECRET_KEYRING" ]; then if ! aptkey_execute "$GPG" -v --batch --import "$FORCED_SECRET_KEYRING" >"${GPGHOMEDIR}/gpgoutput.log" 2>&1; then - cat >&2 "${GPGHOMEDIR}/gpgoutput.log" - false + # already imported keys cause gpg1 to fail for some reason… ignore this error + if ! grep -q 'already in secret keyring' "${GPGHOMEDIR}/gpgoutput.log"; then + cat >&2 "${GPGHOMEDIR}/gpgoutput.log" + false + fi fi else # and then, there are older versions of gpg which panic and implode diff --git a/completions/bash/apt b/completions/bash/apt index 451004982..07bebc9a3 100644 --- a/completions/bash/apt +++ b/completions/bash/apt @@ -158,7 +158,7 @@ _apt() ' -- "$cur" ) ) return 0 ;; - clean|autocleean) + clean|autoclean) COMPREPLY=( $( compgen -W ' -s --simulate --dry-run ' -- "$cur" ) ) @@ -189,7 +189,9 @@ _apt() install) COMPREPLY=( $( apt-cache --no-generate pkgnames "$cur" \ 2> /dev/null ) ) - _filedir "*.deb" + if [[ "$cur" == ./* || "$cur" == /* ]]; then + _filedir "deb" + fi return 0 ;; source|build-dep|showsrc|policy) diff --git a/debian/NEWS b/debian/NEWS index 67275f6e4..bff3621bc 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,13 @@ +apt (1.4.2) unstable; urgency=medium + + If periodic updates and unattended upgrades are enabled, the start of + periodic updates are now distributed over 24 hour intervals (as in 1.2 + to 1.4), whereas starting unattended-upgrade has been restricted to a + time between 6 and 7 am. This only affects systems using systemd, other + systems still use the classical hourly cron job. + + -- Julian Andres Klode <jak@debian.org> Thu, 04 May 2017 22:54:02 +0200 + apt (1.4~beta1) unstable; urgency=medium Support for GPG signatures using the SHA1 or RIPE-MD/160 hash diff --git a/debian/apt-daily-upgrade.service b/debian/apt-daily-upgrade.service new file mode 100644 index 000000000..9652f58fe --- /dev/null +++ b/debian/apt-daily-upgrade.service @@ -0,0 +1,11 @@ +[Unit] +Description=Daily apt upgrade and clean activities +Documentation=man:apt(8) +ConditionACPower=true +After=apt-daily.service + +[Service] +Type=oneshot +ExecStart=/usr/lib/apt/apt.systemd.daily install +KillMode=process +TimeoutStopSec=900 diff --git a/debian/apt-daily-upgrade.timer b/debian/apt-daily-upgrade.timer new file mode 100644 index 000000000..79caf3b5c --- /dev/null +++ b/debian/apt-daily-upgrade.timer @@ -0,0 +1,11 @@ +[Unit] +Description=Daily apt upgrade and clean activities +After=apt-daily.timer + +[Timer] +OnCalendar=*-*-* 6:00 +RandomizedDelaySec=60m +Persistent=true + +[Install] +WantedBy=timers.target diff --git a/debian/apt-daily.service b/debian/apt-daily.service index 904ed5d51..09389c71b 100644 --- a/debian/apt-daily.service +++ b/debian/apt-daily.service @@ -1,9 +1,11 @@ [Unit] -Description=Daily apt activities +Description=Daily apt download activities Documentation=man:apt(8) ConditionACPower=true +After=network-online.target +Wants=network-online.target [Service] Type=oneshot -ExecStart=/usr/lib/apt/apt.systemd.daily +ExecStart=/usr/lib/apt/apt.systemd.daily update diff --git a/debian/apt-daily.timer b/debian/apt-daily.timer index a8e182c85..3b5796217 100644 --- a/debian/apt-daily.timer +++ b/debian/apt-daily.timer @@ -1,10 +1,9 @@ [Unit] -Description=Daily apt activities +Description=Daily apt download activities [Timer] OnCalendar=*-*-* 6,18:00 RandomizedDelaySec=12h -AccuracySec=1h Persistent=true [Install] diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index df9048cd6..2c32b0c9d 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -29,6 +29,11 @@ unamer="$(uname -r | tr '[A-Z]' '[a-z]')" if [ -n "$unamer" ]; then running_version="$(echo "$list" | awk "\$1 == \"$unamer\" { print \$2;exit; }")" fi +# ignore the currently running version if attempting a reproducible build +if [ -n "${SOURCE_DATE_EPOCH}" ]; then + unamer="" + running_version="" +fi latest_version="$(echo "$debverlist" | sed -n 1p)" previous_version="$(echo "$debverlist" | sed -n 2p)" @@ -62,7 +67,7 @@ $list # list of different kernel versions: $debverlist # Installing kernel: $installed_version ($1) -# Running kernel: $running_version ($unamer) +# Running kernel: ${running_version:-ignored} (${unamer:-ignored}) # Last kernel: $latest_version # Previous kernel: $previous_version # Kernel versions list to keep: diff --git a/debian/apt.postinst b/debian/apt.postinst index 1f98fcece..8d1cdb1b3 100755 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -54,7 +54,7 @@ case "$1" in chown -R root:root /var/lib/apt/lists /var/cache/apt/archives || true fi - # ensure tighter permissons on the logs, see LP: #975199 + # ensure tighter permissions on the logs, see LP: #975199 if dpkg --compare-versions "$2" lt-nl 0.9.7.7; then # ensure permissions are right chmod -f 0640 /var/log/apt/term.log* || true diff --git a/debian/apt.systemd.daily b/debian/apt.systemd.daily index 03d41bae5..49af931bd 100755 --- a/debian/apt.systemd.daily +++ b/debian/apt.systemd.daily @@ -291,6 +291,23 @@ debug_echo() } # ------------------------ main ---------------------------- +if [ "$1" = "lock_is_held" ]; then + shift +else + # Maintain a lock on fd 3, so we can't run the script twice at the same + # time. + eval $(apt-config shell StateDir Dir::State/d) + exec 3>${StateDir}/daily_lock + if ! flock -w 3600 3; then + echo "E: Could not acquire lock" >&2 + exit 1 + fi + + # We hold the lock. Rerun this script as a child process, which + # can run without propagating an extra fd to all of its children. + "$0" lock_is_held "$@" 3>&- + exit $? +fi if test -r /var/lib/apt/extended_states; then # Backup the 7 last versions of APT's extended_states file @@ -384,97 +401,112 @@ if [ $UpdateInterval -eq 0 ] && exit 0 fi -# deal with BackupArchiveInterval -do_cache_backup $BackupArchiveInterval +if [ "$1" = "update" -o -z "$1" ] ; then + # deal with BackupArchiveInterval + do_cache_backup $BackupArchiveInterval -# include default system language so that "apt-get update" will -# fetch the right translated package descriptions -if [ -r /etc/default/locale ]; then - . /etc/default/locale - export LANG LANGUAGE LC_MESSAGES LC_ALL -fi + # include default system language so that "apt-get update" will + # fetch the right translated package descriptions + if [ -r /etc/default/locale ]; then + . /etc/default/locale + export LANG LANGUAGE LC_MESSAGES LC_ALL + fi -# update package lists -UPDATED=0 -UPDATE_STAMP=/var/lib/apt/periodic/update-stamp -if check_stamp $UPDATE_STAMP $UpdateInterval; then - if eval apt-get $XAPTOPT -y update $XSTDERR; then - debug_echo "download updated metadata (success)." - if which dbus-send >/dev/null 2>&1 && pidof dbus-daemon >/dev/null 2>&1; then - if dbus-send --system / app.apt.dbus.updated boolean:true ; then - debug_echo "send dbus signal (success)" + # update package lists + UPDATED=0 + UPDATE_STAMP=/var/lib/apt/periodic/update-stamp + if check_stamp $UPDATE_STAMP $UpdateInterval; then + if eval apt-get $XAPTOPT -y update $XSTDERR; then + debug_echo "download updated metadata (success)." + if which dbus-send >/dev/null 2>&1 && pidof dbus-daemon >/dev/null 2>&1; then + if dbus-send --system / app.apt.dbus.updated boolean:true ; then + debug_echo "send dbus signal (success)" + else + debug_echo "send dbus signal (error)" + fi else - debug_echo "send dbus signal (error)" + debug_echo "dbus signal not send (command not available)" fi + update_stamp $UPDATE_STAMP + UPDATED=1 else - debug_echo "dbus signal not send (command not available)" + debug_echo "download updated metadata (error)" fi - update_stamp $UPDATE_STAMP - UPDATED=1 else - debug_echo "download updated metadata (error)" + debug_echo "download updated metadata (not run)." fi -else - debug_echo "download updated metadata (not run)." -fi - -# download all upgradeable packages (if it is requested) -DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp -if [ $UPDATED -eq 1 ] && check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then - if [ $Debdelta -eq 1 ]; then - debdelta-upgrade >/dev/null 2>&1 || true + + # download all upgradeable packages (if it is requested) + DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp + if [ $UPDATED -eq 1 ] && check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then + if [ $Debdelta -eq 1 ]; then + debdelta-upgrade >/dev/null 2>&1 || true + fi + if eval apt-get $XAPTOPT -y -d dist-upgrade $XSTDERR; then + update_stamp $DOWNLOAD_UPGRADEABLE_STAMP + debug_echo "download upgradable (success)" + else + debug_echo "download upgradable (error)" + fi + else + debug_echo "download upgradable (not run)" fi - if eval apt-get $XAPTOPT -y -d dist-upgrade $XSTDERR; then - update_stamp $DOWNLOAD_UPGRADEABLE_STAMP - debug_echo "download upgradable (success)" + + if which unattended-upgrade >/dev/null 2>&1 && unattended-upgrade --help | grep -q download-only && check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $UnattendedUpgradeInterval; then + if unattended-upgrade --download-only $XUUPOPT; then + update_stamp $DOWNLOAD_UPGRADEABLE_STAMP + debug_echo "unattended-upgrade -d (success)" + else + debug_echo "unattended-upgrade -d (error)" + fi else - debug_echo "download upgradable (error)" + debug_echo "unattended-upgrade -d (not run)" fi -else - debug_echo "download upgradable (not run)" fi -# auto upgrade all upgradeable packages -UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp -if which unattended-upgrade >/dev/null 2>&1 && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then - if unattended-upgrade $XUUPOPT; then - update_stamp $UPGRADE_STAMP - debug_echo "unattended-upgrade (success)" +if [ "$1" = "install" -o -z "$1" ] ; then + # auto upgrade all upgradeable packages + UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp + if which unattended-upgrade >/dev/null 2>&1 && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then + if unattended-upgrade $XUUPOPT; then + update_stamp $UPGRADE_STAMP + debug_echo "unattended-upgrade (success)" + else + debug_echo "unattended-upgrade (error)" + fi else - debug_echo "unattended-upgrade (error)" + debug_echo "unattended-upgrade (not run)" fi -else - debug_echo "unattended-upgrade (not run)" -fi -# clean package archive -CLEAN_STAMP=/var/lib/apt/periodic/clean-stamp -if check_stamp $CLEAN_STAMP $CleanInterval; then - if eval apt-get $XAPTOPT -y clean $XSTDERR; then - debug_echo "clean (success)." - update_stamp $CLEAN_STAMP + # clean package archive + CLEAN_STAMP=/var/lib/apt/periodic/clean-stamp + if check_stamp $CLEAN_STAMP $CleanInterval; then + if eval apt-get $XAPTOPT -y clean $XSTDERR; then + debug_echo "clean (success)." + update_stamp $CLEAN_STAMP + else + debug_echo "clean (error)" + fi else - debug_echo "clean (error)" + debug_echo "clean (not run)" fi -else - debug_echo "clean (not run)" -fi -# autoclean package archive -AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp -if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then - if eval apt-get $XAPTOPT -y autoclean $XSTDERR; then - debug_echo "autoclean (success)." - update_stamp $AUTOCLEAN_STAMP + # autoclean package archive + AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp + if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then + if eval apt-get $XAPTOPT -y autoclean $XSTDERR; then + debug_echo "autoclean (success)." + update_stamp $AUTOCLEAN_STAMP + else + debug_echo "autoclean (error)" + fi else - debug_echo "autoclean (error)" + debug_echo "autoclean (not run)" fi -else - debug_echo "autoclean (not run)" -fi -# check cache size -check_size_constraints + # check cache size + check_size_constraints +fi # # vim: set sts=4 ai : diff --git a/debian/changelog b/debian/changelog index 9cfdcaa45..b43c8f1bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,224 @@ +apt (1.4.8) stretch; urgency=medium + + [ Balint Reczey ] + * Gracefully terminate process when stopping apt-daily-upgrade (LP: #1690980) + + [ David Kalnischkies ] + * don't ask an uninit _system for supported archs, this + crashes the mirror method (LP: #1613184) + + [ Julian Andres Klode ] + * Do not warn about duplicate "legacy" targets (Closes: #839259) + (LP: #1697120) + * apt-daily: Pull in network-online.target in service, not timer + - this can cause a severe boot performance regression / hang + (LP: #1716973) + + -- Julian Andres Klode <jak@debian.org> Wed, 13 Sep 2017 18:47:33 +0200 + +apt (1.4.7) stretch; urgency=medium + + * New release with important fixes up to 1.5~beta1; also see LP: #1702326 + + [ Robert Luberda ] + * fix a "critical" typo in old changelog entry (Closes: 866358) + + [ David Kalnischkies ] + * test suite/travis CI: ignore profiling warning in progress lines + * use port from SRV record instead of initial port + + [ Julian Andres Klode ] + * Reset failure reason when connection was successful, so later errors are + reported as such and not as "connection failure" warnings. + * debian/gbp.conf: Set debian-branch to 1.4.y + * http: A response with Content-Length: 0 has no content, so don't try to + read it - it will either timeout or the server closes the connection. + * travis CI: Migrate to Docker + + -- Julian Andres Klode <jak@debian.org> Thu, 13 Jul 2017 23:45:39 +0200 + +apt (1.4.6) unstable; urgency=medium + + * apt.systemd.daily: Do not pass -d to unattended-upgrade for the download + job. This actually enables debugging. Instead check if unattended-upgrade + supports an option --download-only (which is yet to be implemented) and use + that (Closes: #863859) + + -- Julian Andres Klode <jak@debian.org> Thu, 01 Jun 2017 10:50:26 +0200 + +apt (1.4.5) unstable; urgency=medium + + * Fix parsing of or groups in build-deps with ignored packages (LP: #1694697) + + -- Julian Andres Klode <jak@debian.org> Wed, 31 May 2017 14:52:25 +0200 + +apt (1.4.4) unstable; urgency=medium + + [ Alan Jenkins ] + * apt.systemd.daily: fix error from locking code (Closes: #862567) + + -- Julian Andres Klode <jak@debian.org> Tue, 16 May 2017 23:19:50 +0200 + +apt (1.4.3) unstable; urgency=medium + + [ Julian Andres Klode ] + * Do not try to (re)start timers outside 'apt' package (Closes: #862001) + + [ Miroslav Kure ] + * Updated Czech translation of apt (Closes: #861943) + + -- Julian Andres Klode <jak@debian.org> Thu, 11 May 2017 14:46:28 +0200 + +apt (1.4.2) unstable; urgency=medium + + [ Julian Andres Klode ] + * Run unattended-upgrade -d in download part + * apt.systemd.daily: Add locking + * Split apt-daily timer into two (LP: #1686470) + + [ Matt Kraai ] + * bash-completion: Fix spelling of autoclean (Closes: #861846) + + -- Julian Andres Klode <jak@debian.org> Thu, 04 May 2017 22:52:10 +0200 + +apt (1.4.1) unstable; urgency=medium + + [ Julian Andres Klode ] + * systemd: Rework timing and add After=network-online (LP: #1615482) + * debian/rules: Actually invoke dh_clean in override_dh_clean + + [ Unit 193 ] + * apt-ftparchive: Support '.ddeb' dbgsym packages + + -- Julian Andres Klode <jak@debian.org> Mon, 24 Apr 2017 18:47:55 +0200 + +apt (1.4) unstable; urgency=medium + + * The April Fools' Release + + [ Julian Andres Klode ] + * Ignore \.ucf-[a-z]+$ like we do for \.dpkg-[a-z]+$ + * Fix mistake in CHANGEPATH comment example + + [ Chris Lamb ] + * auto-removal: Ignore running kernel if attempting a reproducible build + (Closes: #857632) + + [ Joe Dalton ] + * Danish program translation update (Closes: #856723) + + [ David Kalnischkies ] + * Fix and avoid quoting in CommandLine::AsString (LP: #1672710) + * Ignore AutomaticRemove conffile option in upgrade (Closes: #855891) + + -- Julian Andres Klode <jak@debian.org> Sat, 01 Apr 2017 21:39:37 +0200 + +apt (1.4~rc2) unstable; urgency=medium + + [ David Kalnischkies ] + * add Auto-Built-Package to tagfile-order + * don't test with "too early for 32bit" years + + [ Julian Andres Klode ] + * Do not lowercase package names representing .dsc/.deb/... files (Closes: #854794) + * shippable: Perform CI on Debian stretch instead of Ubuntu xenial + * Don't use -1 fd and AT_SYMLINK_NOFOLLOW for faccessat() + Thanks to James Clarke for debugging these issues + * CMake: Install statvfs.h to include/sys, not just include/ + * debian: Generate debian/copyright during clean + + -- Julian Andres Klode <jak@debian.org> Wed, 22 Feb 2017 16:02:10 +0100 + +apt (1.4~rc1) unstable; urgency=medium + + [ David Kalnischkies ] + * don't show update stats if cache generation is disabled + * don't lock dpkg in 'apt-get clean' + * don't lock dpkg in update commands + * avoid validate/delete/load race in cache generation + * fix 'install --no-download' mode + * remove 'old' FAILED files in the next acquire call (Closes: 846476) + * stop rred from leaking debug messages on recovered errors (Closes: #850759) + * make the moo reproducible. + Thanks to Chris Lamb for initial patch and guru meditation (Closes: #848721) + * update release mappings in documentation + * avoid malloc if option whitelist is disabled (default) + + [ Julian Andres Klode ] + * basehttp: Only read Content-Range on 416 and 206 responses (LP: #1657567) + * test suite: Do not exit 0 in trap for QUIT + * Only merge acquire items with the same meta key (Closes: #838441) + + [ Zhou Mo ] + * po: update Simplified Chinese program translation + + [ Jean-Pierre Giraud ] + * French manpages translation update (Closes: 852460) + + [ victory ] + * Japanese manpages & program translation update + + [ Frans Spiesschaert ] + * Dutch program translation update (Closes: #853761) + * Dutch manpage translation update (Closes: #853762) + + -- Julian Andres Klode <jak@debian.org> Mon, 06 Feb 2017 14:41:23 +0100 + +apt (1.4~beta4) unstable; urgency=medium + + * Read dpkg tables to handle architecture wildcards. + Thanks to James Clarke <jrtc27@jrtc27.com> for the initial patch + (Closes: #748936) + * https: Quote path in URL before passing it to curl (LP: #1651923) + * Update symbols file for changes in 1.3.1, 1.4~beta{1,3,4} + + -- Julian Andres Klode <jak@debian.org> Tue, 17 Jan 2017 15:18:27 +0100 + +apt (1.4~beta3) unstable; urgency=medium + + [ Lukasz Kawczynski ] + * Honour Acquire::ForceIPv4/6 in the https transport + + [ David Kalnischkies ] + * reword "Can't drop priv" warning message (Closes: #813786) (LP: #1522675) + * let {dsc,tar,diff}-only implicitly enable download-only + * remove needless fork() in apt-get source + * default to --no-check for dpkg-source call (Closes: 724744) + * warn if clearsigned file has ignored content parts + * ensure generation of valid EDSP error stanzas + * add --indep-only for build-dep command (Closes: #845775) + * allow default build-essentials to be overridden + * expand -f to --fix-broken in error messages. + Thanks to Kristian Glass for initial patch! (Closes: #709092) + * separating state variables regarding server/request (Closes: #440057) + * fix minimum pkgs option for dpkg --recursive usage + * allow warning generation for non-whitelisted options + + [ Oriol Debian ] + * Catalan program translation update (Closes: #846514) + + [ Frans Spiesschaert ] + * Dutch manpages translation update (Closes: #849235) + + [ Niels Thykier ] + * ParseDepends: Support passing the desired architecture (Closes: #845969) + + -- Julian Andres Klode <jak@debian.org> Thu, 05 Jan 2017 20:50:01 +0100 + +apt (1.4~beta2) unstable; urgency=high + + [ John R. Lenton ] + * bash-completion: Only complete understood file paths for install + (LP: #1645815) + + [ Julian Andres Klode ] + * SECURITY UPDATE: gpgv: Check for errors when splitting files (CVE-2016-1252) + Thanks to Jann Horn, Google Project Zero for reporting the issue + (LP: #1647467) + * gpgv: Flush the files before checking for errors + + -- Julian Andres Klode <jak@debian.org> Thu, 08 Dec 2016 15:21:16 +0100 + apt (1.4~beta1) unstable; urgency=medium [ Chris Leick ] @@ -1409,7 +1630,7 @@ apt (1.1~exp9) experimental; urgency=medium * Make auto-remove and auto-clean aliases for the versions without - (Closes: #274159) * apt: Add autoremove and auto-remove commands - * changelog: Replace spelling reenable by re-enable everywhere. + * changelog: Replace spelling typo for re-enable everywhere. Thanks to Lintian * debian/control: Replace debian by Debian. Thanks to Lintian @@ -1552,7 +1773,7 @@ apt (1.1~exp4) experimental; urgency=medium Do not download more data in the mehotds than expected if we know the size. For the InRelease/Release/Release.gpg add new Acquire::MaxReleaseFileSize that defaults to 10Mb for now - * Verify the the hashes of the downloaded compressed files early + * Verify the hashes of the downloaded compressed files early * Only load unauthenticated data into our parsers when the user explicitly asked for it via --allow-insecure-repositories (Acquire::AllowInsecureRepositories) @@ -1583,7 +1804,7 @@ apt (1.1~exp4) experimental; urgency=medium (Closes: 733028) * use apt-key adv (+ gnupg) instead of gpgv for verify * support gnupg2 as drop-in replacement for gnupg - * allow to specify fingerprints in 'apt-key del' + * allows one to specify fingerprints in 'apt-key del' * use only one --keyring in gpg interactions * add and use 'apt-key verify' which prefers gpgv over gpg * remove empty keyrings in trusted.gpg.d on upgrade @@ -2613,7 +2834,7 @@ apt (0.9.13~exp1) experimental; urgency=low * Improve the API for APT::Upgrade::Upgrade() * Re-add "Calculating upgrade..." message - * move upgrade releated code into upgrade.{cc,h} + * move upgrade related code into upgrade.{cc,h} * Move ListUpdate/AcquireUpdate into update.{cc,h} * Add new apt-pkg/install-progress.h with APT::Progress::PackageManager progress reporting classes @@ -2834,7 +3055,7 @@ apt (0.9.10) unstable; urgency=low * exclude config.{sub,guess} from source package * update the symbol files to reflect current state * unset LANGUAGE for showing [Y/n] answer hints - * fix some unitialized data members + * fix some uninitialized data members * specific pins below 1000 cause downgrades (Closes: 543966) * use pkgTagFile to parse "header" of Release files * fix: --print-uris removes authentication (Closes: 719263) @@ -2996,7 +3217,7 @@ apt (0.9.8.1) unstable; urgency=low [ Michael Vogt ] * moved source to http://git.debian.org/apt/apt.git * updated gbp.conf to match what bzr-buildpackage is doing - * remove .bzr-buildpackage/default.conf (superseeded by gbp.conf) + * remove .bzr-buildpackage/default.conf (superseded by gbp.conf) -- Michael Vogt <mvo@debian.org> Thu, 16 May 2013 14:50:43 +0200 @@ -3148,7 +3369,7 @@ apt (0.9.7.9~exp1) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 22 Mar 2013 21:57:08 +0100 -apt (0.9.7.8) unstable; urgency=criticial +apt (0.9.7.8) unstable; urgency=critical * SECURITY UPDATE: InRelease verification bypass - CVE-2013-1051 @@ -4114,7 +4335,7 @@ apt (0.8.16~exp8) experimental; urgency=low - show a debug why a package was kept by ResolveByKeep() * apt-pkg/packagemanager.cc: - do not fail on unpacked packages in SmartUnPack, just don't - shedule them for unpack, but do all checks and configure them + schedule them for unpack, but do all checks and configure them - do not enter an endless loop for (essential) pre-dependency loops * apt-pkg/contrib/sha2_internal.cc: - use a pointer-union to peace gcc strict-aliasing warning @@ -4982,9 +5203,9 @@ apt (0.8.12) unstable; urgency=low - honor Dpkg::Chroot-Directory in the RunScripts*() methods * apt-pkg/contrib/cdromutl.{cc,h}, apt-pkg/cdrom.{cc,h}: - deal with missing FSTAB_DIR when using libudev to discover cdrom - - add experimental APT::cdrom::CdromOnly option (on by default). + - add experimental APT::cdrom::CdromOnly option (on by default). When this is set to false apt-cdrom will handle any removable - deivce (like a usb-stick) as a "cdrom/dvd" source + device (like a usb-stick) as a "cdrom/dvd" source [ Christian Perrier ] * Fix error in French translation of manpages (apt_preferences(5)). @@ -5407,7 +5628,7 @@ apt (0.8.5) unstable; urgency=low * apt-pkg/deb/deblistparser.cc: - overrule NotAutomatic in case of ButAutomaticUpgrades * debian/apt.cron.daily: - - handle absolut directory paths correctly by loading directories + - handle absolute directory paths correctly by loading directories directly instead of building the paths on our own (Closes: #596421) * debian/control: - build-depend on docbook-xml to ensure that the xml DTDs are always @@ -5659,7 +5880,7 @@ apt (0.7.26~exp11) experimental; urgency=low - handle "circular" conflicts for "all" packages correctly * cmdline/apt-cache.cc: - be able to omit dependency types in (r)depends (Closes: #319006) - - show in (r)depends the canidate per default instead of newest + - show in (r)depends the candidate per default instead of newest - share the (r)depends code instead of codecopy * apt-pkg/cacheset.cc: - move them back to the library as they look stable now @@ -5779,7 +6000,7 @@ apt (0.7.26~exp8) experimental; urgency=low - add another round of const& madness as the previous round accidentally NOT overrides the virtual GetCandidateVer() method (Closes: #587725) * apt-pkg/pkgcachegen.{cc,h}: - - make the used MMap moveable (and therefore dynamic resizeable) by + - make the used MMap moveable (and therefore dynamic resizable) by applying (some) mad pointer magic (Closes: #195018) [ Michael Vogt ] @@ -6569,7 +6790,7 @@ apt (0.7.23.1) unstable; urgency=low [ Michael Vogt ] * apt-pkg/pkgcache.cc: - - do not set internel "needs-configure" state for packages in + - do not set internal "needs-configure" state for packages in triggers-pending state. dpkg will deal with the trigger and it if does it before we trigger it, dpkg will error out (LP: #414631) @@ -6758,7 +6979,7 @@ apt (0.7.22) unstable; urgency=low * doc/apt.conf.5.xml: - merged patch from Aurélien Couderc to improve the text (thanks!) - * [ABI] merged the libudev-dlopen branch, this allows to pass + * [ABI] merged the libudev-dlopen branch, this allows one to pass "apt-udev-auto" to Acquire::Cdrom::mount and the cdrom method will dynamically find/mount the cdrom device (if libhal is available) @@ -7288,7 +7509,7 @@ apt (0.7.12) unstable; urgency=low so that it can correct any missing dependencies * debian/apt.cron.daily: - sleep random amount of time (default within 0-30min) before - starting the upate to hit the mirrors less hard + starting the update to hit the mirrors less hard * doc/apt_preferences.5.xml: - fix typo * added debian/README.source @@ -7779,7 +8000,7 @@ apt (0.6.46.4) unstable; urgency=high - added "Dpkg::StopOnError" variable that controls if apt will abort on errors from dpkg * apt-pkg/deb/debsrcrecords.{cc,h}: - - make the Buffer grow dynmaically (closes: #400874) + - make the Buffer grow dynamically (closes: #400874) * Merged from Christian Perrier bzr branch: - uk.po: New Ukrainian translation: 483t28f3u - el.po: Update to 503t9f2u @@ -9386,7 +9607,7 @@ apt (0.5.5) unstable; urgency=low * When matching regexs always print a message. Change regex activation charset. Closes: #147817 * Don't die if lines in sources.list are too long. Closes: #146846 - * Show file name on apt-extracttemplate error messges. Closes: #151835 + * Show file name on apt-extracttemplate error messages. Closes: #151835 * i18n gettext stuff, based on work from Michael Piefel: Closes: #95933 * Some highly unlikely memory faults. Closes: #155842 * C++ stuff for G++3.2. Closes: #162617, #165515, @@ -9504,7 +9725,7 @@ apt (0.5.4) unstable; urgency=low * Various changes to the locking metholodgy for --print-uris. Closes: #100590 * Lame LD_LIBRARY_PATH thing. Closes: #98928 - * apt-cache search searchs provide names too now. Closes: #98695 + * apt-cache search searches provide names too now. Closes: #98695 * Checksum and long lines problem. Closes: #106591 * .aptignr and empty files are just a warning. Closes: #97364 @@ -9614,7 +9835,7 @@ apt (0.5.0) unstable; urgency=low * Caching can be turned off by setting the cache file names blank. * Ignores arches it does not know about when autocleaning. Closes: #72862 * New function in apt-config to return dirs, files, bools and integers. - * Fixed an odd litle bug in MarkInstall and fixed it up to handle + * Fixed an odd little bug in MarkInstall and fixed it up to handle complex cases involving OR groups and provides. 68754 describes confusing messages which are the result of this.. Closes: #63149, #69394, #68754, #77683, #66806, #81486, #78712 @@ -9664,7 +9885,7 @@ apt (0.3.19) frozen unstable; urgency=low * Fixed Jay's relative path bug * Allowed source only CDs. Closes: #58952 * Space check is suppressed if --print-uris is given. Closes: #58965 - * Clarified the documenation examples for non-us. Closes: #58646 + * Clarified the documentation examples for non-us. Closes: #58646 * Typo in the package description. Closes: #60230 * Man Page typo. Closes: #60347 * Typo in Algorithms.cc. Closes: #63577 @@ -9715,7 +9936,7 @@ apt (0.3.16) unstable; urgency=low * Now compiles on OpenBSD, Solaris and HP-UX * Clarify segfault errors * More debhelper fixes. Closes: #52662, #54566, #52090, #53531, #54769 - * Fix for Joel's discovery of glibc removal behavoir. + * Fix for Joel's discovery of glibc removal behavior. * Fix for Ben Collins file: uri from slink upgrade. * Fixed resume code in FTP. Closes: #54323 * Take more precautions to prevent the corruption Joey Hess saw. @@ -9841,7 +10062,7 @@ apt (0.3.7) unstable; urgency=low * Added a check for an empty cache directory. Closes: #37963 * Return a failure code if -d is given and packages fail to download. Closes: #38127 - * Arranged for an ftp proxy specifing an http server to work. See the + * Arranged for an ftp proxy specifying an http server to work. See the important note in the sources.list man page. * Accounted for resumed files in the cps calculation. Closes: #36787 * Deal with duplicate same version different packages. Closes: #30237 diff --git a/debian/copyright b/debian/copyright deleted file mode 120000 index 012065c85..000000000 --- a/debian/copyright +++ /dev/null @@ -1 +0,0 @@ -../COPYING
\ No newline at end of file diff --git a/debian/gbp.conf b/debian/gbp.conf index a5e885896..610efb0c3 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -3,7 +3,7 @@ ;preexport = ./prepare-release pre-export prebuild = ./prepare-release pre-build postbuild = ./prepare-release post-build -debian-branch = master +debian-branch = 1.4.y debian-tag = %(version)s export-dir = ../build-area sign-tags = True diff --git a/debian/libapt-pkg5.0.symbols b/debian/libapt-pkg5.0.symbols index da52e4825..2f625d2e1 100644 --- a/debian/libapt-pkg5.0.symbols +++ b/debian/libapt-pkg5.0.symbols @@ -1488,3 +1488,9 @@ libapt-pkg.so.5.0 libapt-pkg5.0 #MINVER# (c++)"void std::vector<pkgDPkgPM::Item, std::allocator<pkgDPkgPM::Item> >::emplace_back<pkgDPkgPM::Item::Ops, pkgCache::PkgIterator&>(pkgDPkgPM::Item::Ops&&, pkgCache::PkgIterator&)@APTPKG_5.0" 1.3~rc2 (c++)"void std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::emplace_back<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&>(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_5.0" 1.3~rc2 (c++)"void std::vector<std::pair<pkgDPkgPM::Item*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<pkgDPkgPM::Item*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::emplace_back<pkgDPkgPM::Item*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >(pkgDPkgPM::Item*&&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&&)@APTPKG_5.0" 1.3~rc2 + (c++)"AddCRC16Byte(unsigned short, unsigned char)@APTPKG_5.0" 1.4~beta1 + (c++)"APT::String::Join(std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_5.0" 1.4~beta4 + (c++)"debListParser::ParseDepends(char const*, char const*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&, bool const&, bool const&, bool const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_5.0" 1.4~beta3 + (c++)"pkgTagHash(char const*, unsigned long)@APTPKG_5.0" 1.4~beta1 + (c++)"Popen(char const**, FileFd&, int&, FileFd::OpenMode, bool)@APTPKG_5.0" 1.3.1 + (c++|optional=std)"void std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::emplace_back<char const (&) [4]>(char const (&) [4])@APTPKG_5.0" 1.4~beta4 diff --git a/debian/rules b/debian/rules index 62d913f0a..ede9591d1 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,10 @@ export CTEST_OUTPUT_ON_FAILURE=1 %: dh $@ +override_dh_clean: + cp COPYING debian/copyright + dh_clean + override_dh_install-indep: dh_install --list-missing @@ -33,7 +37,8 @@ override_dh_systemd_start: # Do not restart "apt-daily.service" because this script runs # unattended-upgrades. So if apt itself is upgraded as part of # an unattended-upgrades run it would kill itself - dh_systemd_start apt-daily.timer + dh_systemd_start -papt apt-daily.timer apt-daily-upgrade.timer + dh_systemd_start --remaining-packages override_dh_auto_configure-arch: flags=-DWITH_DOC=OFF override_dh_auto_configure-indep: flags=-DWITH_DOC=ON diff --git a/doc/acquire-additional-files.txt b/doc/acquire-additional-files.txt index c9bea068f..c55d5fe19 100644 --- a/doc/acquire-additional-files.txt +++ b/doc/acquire-additional-files.txt @@ -217,9 +217,9 @@ To get all the filenames of all Translation-en files you can e.g. call: apt-get indextargets --format '$(FILENAME)' "Identifier: Translations" "Language: en" The line-based filtering and the formatting is rather crude and feature- -less by design: The default format is Debians standard format deb822 (in -particular: Field names are case-insensitive and the order of fields in -the stanza is undefined), so instead of apt reimplementing powerful +less by design: The default format is Debian's standard format deb822 +(in particular: Field names are case-insensitive and the order of fields +in the stanza is undefined), so instead of apt reimplementing powerful filters and formatting for this command, it is recommend to use piping and dedicated tools like 'grep-dctrl' if you need more than the basics provided. diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index ff7b38e97..931a4f313 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -14,7 +14,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2016-11-25T00:00:00Z</date> + <date>2017-02-22T00:00:00Z</date> </refentryinfo> <refmeta> @@ -545,12 +545,17 @@ Configuration Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</literal>, and <literal>APT::Get::Tar-Only</literal>.</para></listitem> </varlistentry> - + <varlistentry><term><option>--arch-only</option></term> <listitem><para>Only process architecture-dependent build-dependencies. Configuration Item: <literal>APT::Get::Arch-Only</literal>.</para></listitem> </varlistentry> + <varlistentry><term><option>--indep-only</option></term> + <listitem><para>Only process architecture-independent build-dependencies. + Configuration Item: <literal>APT::Get::Indep-Only</literal>.</para></listitem> + </varlistentry> + <varlistentry><term><option>--allow-unauthenticated</option></term> <listitem><para>Ignore if packages can't be authenticated and don't prompt about it. This can be useful while working with local repositories, diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index eacd18d4d..279c417c7 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -133,7 +133,7 @@ <listitem> <para> Pass advanced options to gpg. With <command>adv --recv-key</command> you - can e.g. download key from keyservers directly into the the trusted set of + can e.g. download key from keyservers directly into the trusted set of keys. Note that there are <emphasis>no</emphasis> checks performed, so it is easy to completely undermine the &apt-secure; infrastructure if used without care. diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 924341d9d..84b314c9c 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -239,20 +239,20 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "1.4~beta1"> +<!ENTITY apt-product-version "1.4.8"> <!-- (Code)names for various things used all over the place --> -<!ENTITY debian-oldstable-codename "wheezy"> -<!ENTITY debian-stable-codename "jessie"> -<!ENTITY debian-testing-codename "stretch"> -<!ENTITY debian-stable-version "8"> -<!ENTITY ubuntu-codename "trusty"> +<!ENTITY debian-oldstable-codename "jessie"> +<!ENTITY debian-stable-codename "stretch"> +<!ENTITY debian-testing-codename "buster"> +<!ENTITY debian-stable-version "9"> +<!ENTITY ubuntu-codename "xenial"> <!-- good and bad just refers to matching and not matching a pattern… It is not a remark about the specific perl version. - There is no way perl could be clasified "good" (or "bad") in any version… --> -<!ENTITY good-perl "5.10"> -<!ENTITY bad-perl "5.14"> + There is no way perl could be classified "good" (or "bad") in any version… --> +<!ENTITY good-perl "5.20"> +<!ENTITY bad-perl "5.24"> <!-- Arguments --> <!ENTITY synopsis-arg-option "<arg><option>-o=<replaceable>&synopsis-config-string;</replaceable></option></arg>"> diff --git a/doc/dpkg-tech.dbk b/doc/dpkg-tech.dbk index f95716cf4..d2d5061ab 100644 --- a/doc/dpkg-tech.dbk +++ b/doc/dpkg-tech.dbk @@ -95,7 +95,7 @@ therefore not be configured while broken </listitem> </itemizedlist> <para> -Each of these dependencies can specify a version and a depedency on that +Each of these dependencies can specify a version and a dependency on that version, for example "<= 0.5-1", "== 2.7.2-1", etc. The comparators available are:- </para> diff --git a/doc/examples/apt-https-method-example.conf b/doc/examples/apt-https-method-example.conf index a03766746..3152ef1e2 100644 --- a/doc/examples/apt-https-method-example.conf +++ b/doc/examples/apt-https-method-example.conf @@ -113,7 +113,7 @@ Acquire::https::secure.dom2.tld::SslKey "/etc/apt/certs/my-key.pem"; Acquire::https[::repo.domain.tld]::IssuerCert "/path/to/issuer/cert.pem"; - Allows to constrain the issuer of the server certificate (for all + Allows one to constrain the issuer of the server certificate (for all https mirrors or a specific one) to a specific issuer. If the server certificate has not been issued by this certificate, connection fails. diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 2d0fb6c64..eb0a242c5 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -1,85 +1,140 @@ -/* This file is an index of all APT configuration directives. It should - NOT actually be used as a real config file, though it is (except for the - last line) a completely valid file. Most of the options have sane default - values, unless you have specific needs you should NOT include arbitrary +/* This file is an index of all APT configuration directives. + Instead of actual values the option has the type as value. + Additional explanations and possible values might be detailed in a comment. + + Most of the options have sane default values, + unless you have specific needs you should NOT include arbitrary items in a custom configuration. - + In some instances involving filenames it is possible to set the default directory when the path is evaluated. This means you can use relative paths within the sub scope. - + The configuration directives are specified in a tree with {} designating a subscope relative to the tag before the {}. You can further specify - a subscope using scope notation eg, + a subscope using scope notation e.g., APT::Architecture "i386"; This is prefixed with the current scope. Scope notation must be used if an option is specified on the command line with -o. + + The most complex type is perhaps <LIST>: + APT::Architectures "<LIST>"; + In configuration files it usually appears as a subscope of its own like: + APT::Architectures { "amd64"; "i386"; }; + but the same can be achieved with (needed for commandline) + APT::Architectures "amd64,i386"; + which overrides the values in the scope notation. + + See apt.conf manpage for a detailed description of many common options + and the syntax of configuration files and commandline options! */ -quiet "0"; -quiet::NoUpdate "true"; // never update progress information - included in -q=1 +quiet "<INT>"; +quiet::NoUpdate "<BOOL>"; // never update progress information - included in -q=1 +quiet::NoProgress "<BOOL>"; // disables the 0% → 100% progress on cache generation and stuff +quiet::NoStatistic "<BOOL>"; // no "42 kB downloaded" stats in update // Options for APT in general -APT +APT { - Architecture "i386"; - Architectures { "amd64"; "armel"; }; - Build-Essential "build-essential"; + Architecture "<STRING>"; // debian architecture like amd64, i386, powerpc, armhf, mips, … + Architectures "<LIST>"; // a list of (foreign) debian architectures, defaults to: dpkg --print-foreign-architectures - NeverAutoRemove { "linux-image.*"; }; // packages that should never - // considered for autoRemove + Build-Essential "<LIST>"; // list of package names + Build-Profiles "<STRING_OR_LIST>"; + + NeverAutoRemove "<LIST>"; // list of package name regexes // Options for apt-get - Get + Get { - Host-Architecture "armel"; - Arch-Only "false"; - AllowUnauthenticated "false"; // packages from unauthenticated - AutomaticRemove "false"; - HideAutoRemove "false"; - Download-Only "false"; - Simulate "false"; - Assume-Yes "false"; - Force-Yes "false"; // I would never set this. - Fix-Broken "false"; - Fix-Missing "false"; - Show-Upgraded "false"; - Show-Versions "false"; - Upgrade "true"; - Print-URIs "false"; - Compile "false"; - Download "true"; - Purge "false"; - List-Cleanup "true"; - ReInstall "false"; - Trivial-Only "false"; - Remove "true"; - Only-Source ""; - Diff-Only "false"; - Tar-Only "false"; - Build-Dep-Automatic "true"; - Show-User-Simulation-Note "true"; + // build-dep options: + Host-Architecture "<STRING>"; // debian architecture + Arch-Only "<BOOL>"; + Indep-Only "<BOOL>"; + Build-Dep-Automatic "<BOOL>"; + + // (non-)confirming options + Force-Yes "<BOOL>"; // allows downgrades, essential removal and eats children + Allow-Downgrades "<BOOL>"; + Allow-Change-Held-Packages "<BOOL>"; + Allow-Remove-Essential "<BOOL>"; + Assume-Yes "<BOOL>"; // not as dangerous, but use with care still + Assume-No "<BOOL>"; + Trivial-Only "<BOOL>"; + Remove "<BOOL>"; + AllowUnauthenticated "<BOOL>"; // skip security + + AutomaticRemove "<BOOL>"; + HideAutoRemove "<STRING_OR_BOOL>"; // yes, no, small + + Simulate "<BOOL>"; + Show-User-Simulation-Note "<BOOL>"; + Fix-Broken "<BOOL>"; + Fix-Policy-Broken "<BOOL>"; + + Download "<BOOL>"; + Download-Only "<BOOL>"; + Fix-Missing "<BOOL>"; + Print-URIs "<BOOL>"; + List-Cleanup "<BOOL>"; + + Show-Upgraded "<BOOL>"; + Show-Versions "<BOOL>"; + Upgrade "<BOOL>"; + Only-Upgrade "<BOOL>"; + Upgrade-Allow-New "<BOOL>"; + Purge "<BOOL>"; + ReInstall "<BOOL>"; + Compile "<BOOL>"; + Only-Source "<BOOL>"; + Diff-Only "<BOOL>"; + Tar-Only "<BOOL>"; + Dsc-Only "<BOOL>"; + + Autosolving "<BOOL>"; + CallResolver "<BOOL>"; + IndexTargets::ReleaseInfo "<BOOL>"; + IndexTargets::format "<STRING>"; }; - Cache + Cache { - Important "false"; - AllVersions "false"; - GivenOnly "false"; - RecurseDepends "false"; - ShowFull "false"; - Generate "true"; - NamesOnly "false"; - AllNames "false"; - Installed "false"; + AllNames "<BOOL>"; + AllVersions "<BOOL>"; + Only-Source "<BOOL>"; + GivenOnly "<BOOL>"; + RecurseDepends "<BOOL>"; + Installed "<BOOL>"; + Important "<BOOL>"; + ShowDependencyType "<BOOL>"; + ShowVersion "<BOOL>"; + ShowPre-Depends "<BOOL>"; + ShowDepends "<BOOL>"; + ShowRecommends "<BOOL>"; + ShowSuggests "<BOOL>"; + ShowReplaces "<BOOL>"; + ShowConflicts "<BOOL>"; + ShowBreaks "<BOOL>"; + ShowEnhances "<BOOL>"; + ShowOnlyFirstOr "<BOOL>"; + ShowImplicit "<BOOL>"; + ShowVirtuals "<BOOL>"; + ShowFull "<BOOL>"; + NamesOnly "<BOOL>"; + + show::version "<INT>"; + search::version "<INT>"; }; - CDROM + CDROM { - Rename "false"; - NoMount "false"; - Fast "false"; - NoAct "false"; + Rename "<BOOL>"; + NoMount "<BOOL>"; + Fast "<BOOL>"; + NoAct "<BOOL>"; + Thorough "<BOOL>"; + DropTranslation "<BOOL>"; }; Update @@ -88,8 +143,8 @@ APT Post-Invoke {"touch /var/lib/apt/post-update-stamp"; }; }; - // define a new supported compressor on the fly - APT::Compressor::rev { + /* define a new supported compressor on the fly + Compressor::rev { Name "rev"; Extension ".reversed"; Binary "rev"; @@ -97,109 +152,75 @@ APT UncompressArg {}; Cost "10"; }; + */ + Compressor "<LIST>"; + Compressor::** "<UNDEFINED>"; Authentication { - TrustCDROM "false"; // consider the CD-ROM always trusted + TrustCDROM "false"; // consider the CD-ROM always trusted }; + Clean-Installed "<BOOL>"; + // Some general options - Ignore-Hold "false"; - Clean-Installed "true"; - Immediate-Configure "true"; // DO NOT turn this off, see the man page - Force-LoopBreak "false"; // DO NOT turn this on, see the man page - Cache-Start "20971520"; - Cache-Grow "1048576"; - Cache-Limit "0"; - Default-Release ""; - - // consider Recommends, Suggests as important dependencies that should + Default-Release "<STRING>"; + Ignore-Hold "<BOOL>"; + Immediate-Configure "<BOOL>"; + Immediate-Configure-All "<BOOL>"; + Force-LoopBreak "<BOOL>"; + + Cache-Start "<INT>"; + Cache-Grow "<INT>"; + Cache-Limit "<INT>"; + Cache-Fallback "<BOOL>"; + Cache-HashTableSize "<INT>"; + + // consider Recommends/Suggests as important dependencies that should // be installed by default - Install-Recommends "true"; - Install-Suggests "false"; + Install-Recommends "<BOOL>"; + Install-Suggests "<BOOL>"; // reverse Recommends or Suggests prevent autoremoval - AutoRemove::RecommendsImportant "true"; - AutoRemove::SuggestsImportant "true"; + AutoRemove::RecommendsImportant "<BOOL>"; + AutoRemove::SuggestsImportant "<BOOL>"; // consider dependencies of packages in this section manual Never-MarkAuto-Sections {"metapackages"; "universe/metapackages"; }; // Write progress messages on this fd (for stuff like base-config) - Status-Fd "-1"; + Status-Fd "<INT>"; + Status-deb822-Fd "<INT>"; // Keep the list of FDs open (normally apt closes all fds when it // does a ExecFork) Keep-Fds {}; - // control parameters for cron jobs by /etc/cron.daily/apt - Periodic - { - BackupArchiveInterval "0"; - // - Backup after n-days if archive contents changed.(0=disable) - - BackupLevel "3"; - // - Backup level.(0=disable), 1 is invalid. - - // APT::Archives::MaxAge "0"; (old, deprecated) - MaxAge "0"; // (new) - // - Set maximum allowed age of a cache package file. If a cache - // package file is older it is deleted (0=disable) - - // APT::Archives::MinAge "2"; (old, deprecated) - MinAge "2"; // (new) - // - Set minimum age of a package file. If a file is younger it - // will not be deleted (0=disable). Useful to prevent races - // and to keep backups of the packages for emergency. - - // APT::Archives::MaxSize "0"; (old, deprecated) - MaxSize "0"; // (new) - // - Set maximum size of the cache in MB (0=disable). If the cache - // is bigger, cached package files are deleted until the size - // requirement is met (the oldest packages will be deleted - // first). - - Update-Package-Lists "0"; - // - Do "apt-get update" automatically every n-days (0=disable) - // - Download-Upgradeable-Packages "0"; - // - Do "apt-get upgrade --download-only" every n-days (0=disable) - // - Unattended-Upgrade "0"; - // - Run the "unattended-upgrade" security upgrade script - // every n-days (0=disabled) - // Requires the package "unattended-upgrades" and will write - // a log in /var/log/unattended-upgrades - // - AutocleanInterval "0"; - // - Do "apt-get autoclean" every n-days (0=disable) - - Verbose "0"; - // - Send report mail to root - // 0: no report (or null string) - // 1: progress report (actually any string) - // 2: + command outputs (remove -qq, remove 2>/dev/null, add -d) - // 3: + trace on - }; + // control parameters for cron jobs by /etc/cron.daily/apt documented there + Periodic {}; }; // Options for the downloading routines Acquire { - Queue-Mode "host"; // host|access - Retries "0"; - Source-Symlinks "true"; - ForceHash "sha256"; // hashmethod used for expected hash: sha256, sha1 or md5sum + Queue-Mode "<STRING>"; // host or access + Retries "<INT>"; + Source-Symlinks "<BOOL>"; + ForceHash "<STRING>"; // hashmethod used for expected hash: sha256, sha1 or md5sum + + PDiffs "<BOOL>"; // try to get the IndexFile diffs + PDiffs::FileLimit "<INT>"; // don't use diffs if we would need more than 4 diffs + PDiffs::SizeLimit "<INT>"; // don't use diffs if size of all patches excess X% of the size of the original file + PDiffs::Merge "<BOOL>"; - PDiffs "true"; // try to get the IndexFile diffs - PDiffs::FileLimit "4"; // don't use diffs if we would need more than 4 diffs - PDiffs::SizeLimit "50"; // don't use diffs if size of all patches excess - // 50% of the size of the original file + Check-Valid-Until "<BOOL>"; + Max-ValidTime "<INT>"; // time in seconds + Max-ValidTime::* "<INT>"; // repository label specific configuration + Min-ValidTime "<INT>"; // time in seconds + Min-ValidTime::* "<INT>"; // repository label specific configuration - Check-Valid-Until "true"; - Max-ValidTime "864000"; // 10 days - Max-ValidTime::Debian-Security "604800"; // 7 days, label specific configuration + SameMirrorForAllIndexes "<BOOL>"; // use the mirror serving the Release file for Packages & co // HTTP method configuration - http + http { Proxy "http://127.0.0.1:3128"; Proxy::http.us.debian.org "DIRECT"; // Specific per-host setting @@ -210,17 +231,15 @@ Acquire // Cache Control. Note these do not work with Squid 2.0.2 No-Cache "false"; Max-Age "86400"; // 1 Day age on index files - No-Store "false"; // Prevent the cache from storing archives - Dl-Limit "7"; // 7Kb/sec maximum download rate + No-Store "false"; // Prevent the cache from storing archives + Dl-Limit "<INT>"; // Kb/sec maximum download rate User-Agent "Debian APT-HTTP/1.3"; }; - - // HTTPS method configuration: uses the http // - proxy config // - cache-control values - // - Dl-Limit, Timout, ... values + // - Dl-Limit, Timeout, ... values // if not set explicit for https // // see /usr/share/doc/apt/examples/apt-https-method-example.conf.gz @@ -240,7 +259,7 @@ Acquire No-Cache "false"; Max-Age "86400"; // 1 Day age on index files No-Store "false"; // Prevent the cache from storing archives - Dl-Limit "7"; // 7Kb/sec maximum download rate + Dl-Limit "<INT>"; // Kb/sec maximum download rate User-Agent "Debian APT-CURL/1.0"; }; @@ -271,8 +290,7 @@ Acquire cdrom { - // do auto detection of the cdrom mountpoint - AutoDetect "true"; + AutoDetect "<BOOL>"; // do auto detection of the cdrom mountpoint // when auto-detecting, only look for cdrom/dvd. when this is false // it will support any removable device as a "cdrom" source CdromOnly "true"; @@ -293,99 +311,102 @@ Acquire Options {"--ignore-time-conflict";} // not very useful on a normal system }; - CompressionTypes + /* CompressionTypes { bz2 "bzip2"; lzma "lzma"; gz "gzip"; Order { "uncompressed"; "gz"; "lzma"; "bz2"; }; - }; + }; */ + CompressionTypes::Order "<LIST>"; + CompressionTypes::* "<STRING>"; - Languages - { - "environment"; - "de"; - "en"; - "none"; - "fr"; - }; + Languages "<LIST>"; // "environment,de,en,none,fr"; // Location of the changelogs with the placeholder @CHANGEPATH@ (e.g. "main/a/apt/apt_1.1") - Changelogs::URI::Origin::Debian "http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog"; + Changelogs::URI + { + // Origin::Debian "http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog"; + Origin::* "<STRING>"; + Label::* "<STRING>"; + Override::Origin::* "<STRING>"; + Override::Label::* "<STRING>"; + }; + Changelogs::AlwaysOnline "<BOOL>"; // even if the changelog file exists get it online (as the file is incomplete) + Changelogs::AlwaysOnline::Origin::* "<BOOL>"; }; // Directory layout -Dir "/" +Dir "<DIR>" { + Ignore-Files-Silently "<LIST>"; // of regexes: "\.dpkg-[a-z]+$,\.bak$,~$"; + // Location of the state dir - State "var/lib/apt/" + State "<DIR>" { - Lists "lists/"; - status "/var/lib/dpkg/status"; - extended_states "extended_states"; - cdroms "cdroms.list"; + Lists "<DIR>"; + status "<FILE>"; + extended_states "<FILE>"; + cdroms "<FILE>"; }; - + // Location of the cache dir - Cache "var/cache/apt/" { - Archives "archives/"; - // backup directory created by /etc/cron.daily/apt - Backup "backup/"; - srcpkgcache "srcpkgcache.bin"; - pkgcache "pkgcache.bin"; + Cache "<DIR>" { + Archives "<DIR>"; + Backup "backup/"; // backup directory created by /etc/cron.daily/apt + srcpkgcache "<FILE>"; + pkgcache "<FILE>"; }; - + // Config files - Etc "etc/apt/" { - Main "apt.conf"; - Netrc "auth.conf"; - Parts "apt.conf.d/"; - Preferences "preferences"; - PreferencesParts "preferences.d"; - SourceList "sources.list"; - SourceParts "sources.list.d"; - VendorList "vendors.list"; - VendorParts "vendors.list.d"; - Trusted "trusted.gpg"; - TrustedParts "trusted.gpg.d"; + Etc "<DIR>" { + Main "<FILE>"; + Netrc "<FILE>"; + Parts "<DIR>"; + Preferences "<FILE>"; + PreferencesParts "<DIR>"; + SourceList "<FILE>"; + SourceParts "<DIR>"; + Trusted "<FILE>"; + TrustedParts "<DIR>"; }; - + // Locations of binaries Bin { - methods "/usr/lib/apt/methods/"; - gzip "/bin/gzip"; + methods "<DIR>"; + methods::* "<FILE>"; gpg "/usr/bin/gpgv"; - dpkg "/usr/bin/dpkg"; - dpkg-source "/usr/bin/dpkg-source"; + dpkg "<PROGRAM_PATH>"; + dpkg-source "<PROGRAM_PATH>"; dpkg-buildpackage "/usr/bin/dpkg-buildpackage"; - apt-get "/usr/bin/apt-get"; - apt-cache "/usr/bin/apt-cache"; + lz4 "<PROGRAM_PATH>"; + gzip "<PROGRAM_PATH>"; + xz "<PROGRAM_PATH>"; + bzip2 "<PROGRAM_PATH>"; + lzma "<PROGRAM_PATH>"; + uncompressed "<PROGRAM_PATH>"; + + solvers "<LIST>"; // of directories + planners "<LIST>"; // of directories }; - // Location of the logfile - Log "var/log/apt" { - Terminal "term.log"; - History "history.log"; + // Location of the logfiles + Log "<DIR>" { + Terminal "<FILE>"; + History "<FILE>"; + Solver "<FILE>"; + Planner "<FILE>"; }; - // Media - Media + Media { - // Media AutoDetect mount path - MountPath "/media/apt"; - }; - - // Media - Media - { - // Media AutoDetect mount path - MountPath "/media/apt"; + MountPath "/media/apt"; // Media AutoDetect mount path }; }; // Things that effect the APT dselect method -DSelect +DSelect { Clean "auto"; // always|auto|prompt|never Options "-f"; @@ -396,9 +417,9 @@ DSelect DPkg { - // let apt aggressivly use dpkg triggers - NoTriggers "true"; - ConfigurePending "true"; + NoTriggers "<BOOL>"; + ConfigurePending "<BOOL>"; + TriggersPending "<BOOL>"; // Probably don't want to use force-downgrade.. Options {"--force-overwrite";"--force-downgrade";} @@ -421,9 +442,15 @@ DPkg // Flush the contents of stdin before forking dpkg. FlushSTDIN "true"; - // Control the size of the command line passed to dpkg. - MaxArgBytes 32768; - MaxArgs 8192; + MaxArgBytes "<INT>"; // Control the size of the command line passed to dpkg. + Install::Recursive "<BOOL>" // avoid long commandlines by recursive install in a tmpdir + { + force "<BOOL>"; // not all dpkg versions support this, so autodetection is default + minimum "<INT>"; // don't bother if its just a few packages + numbered "<BOOL>"; // avoid M-A:same ordering bug in dpkg + }; + + UseIONice "<BOOL>"; // controls if apt will apport on the first dpkg error or if it // tries to install as many packages as possible @@ -434,40 +461,298 @@ DPkg of classes in the source code */ Debug { - pkgProblemResolver "false"; - pkgProblemResolver::ShowScores "false"; - pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies - pkgDepCache::Marker "false"; - pkgCacheGen "false"; - pkgAcquire "false"; - pkgAcquire::Worker "false"; - pkgAcquire::Auth "false"; - pkgDPkgPM "false"; - pkgDPkgProgressReporting "false"; - pkgOrderList "false"; - pkgPackageManager "false"; // OrderList/Configure debugging - pkgAutoRemove "false"; // show information about automatic removes - BuildDeps "false"; - pkgInitialize "false"; // This one will dump the configuration space - NoLocking "false"; - Acquire::Ftp "false"; // Show ftp command traffic - Acquire::Http "false"; // Show http command traffic - Acquire::Https "false"; // Show https debug - Acquire::gpgv "false"; // Show the gpgv traffic - Acquire::cdrom "false"; // Show cdrom debug output - aptcdrom "false"; // Show found package files - IdentCdrom "false"; - acquire::netrc "false"; // netrc parser - RunScripts "false"; // debug invocation of external scripts -} + pkgInitConfig "<BOOL>"; + pkgProblemResolver "<BOOL>"; + pkgProblemResolver::ShowScores "<BOOL>"; + pkgDepCache::AutoInstall "<BOOL>"; // what packages apt installs to satisfy dependencies + pkgDepCache::Marker "<BOOL>"; + pkgCacheGen "<BOOL>"; + pkgAcquire "<BOOL>"; + pkgAcquire::Worker "<BOOL>"; + pkgAcquire::Auth "<BOOL>"; + pkgAcquire::Diffs "<BOOL>"; + pkgDPkgPM "<BOOL>"; + pkgDPkgProgressReporting "<BOOL>"; + pkgOrderList "<BOOL>"; + pkgPackageManager "<BOOL>"; // OrderList/Configure debugging + pkgAutoRemove "<BOOL>"; // show information about automatic removes + BuildDeps "<BOOL>"; + pkgInitialize "<BOOL>"; // This one will dump the configuration space + NoLocking "<BOOL>"; + Acquire::Ftp "<BOOL>"; // Show ftp command traffic + Acquire::Http "<BOOL>"; // Show http command traffic + Acquire::Https "<BOOL>"; // Show https debug + Acquire::gpgv "<BOOL>"; // Show the gpgv traffic + Acquire::cdrom "<BOOL>"; // Show cdrom debug output + Acquire::Transaction "<BOOL>"; + Acquire::Progress "<BOOL>"; + aptcdrom "<BOOL>"; // Show found package files + IdentCdrom "<BOOL>"; + acquire::netrc "<BOOL>"; // netrc parser + RunScripts "<BOOL>"; // debug invocation of external scripts + pkgPolicy "<BOOL>"; + GetListOfFilesInDir "<BOOL>"; + pkgAcqArchive::NoQueue "<BOOL>"; + Hashes "<BOOL>"; + APT::FtpArchive::Clean "<BOOL>"; + NoDropPrivs "<BOOL>"; + EDSP::WriteSolution "<BOOL>"; + InstallProgress::Fancy "<BOOL>"; + APT::Progress::PackageManagerFd "<BOOL>"; +}; pkgCacheGen { - Essential "native"; // other modes: all, none, installed - ForceEssential { "apt"; }; - ForceImportant ""; -} + Essential "<STRING>"; // native,all, none, installed + ForceEssential "<STRING_OR_LIST>"; // package names + ForceImportant "<LIST>"; // package names +}; + +// modify points awarded for various facts about packages while +// resolving conflicts in the dependency resolution process +pkgProblemResolver::Scores +{ + Required "<INT>"; + Important "<INT>"; + Standard "<INT>"; + Optional "<INT>"; + Extra "<INT>"; + Essentials "<INT>"; + NotObsolete "<INT>"; + Depends "<INT>"; + PreDepends "<INT>"; + Suggests "<INT>"; + Recommends "<INT>"; + Conflicts "<INT>"; + Replaces "<INT>"; + Obsoletes "<INT>"; + Breaks "<INT>"; + Enhances "<INT>"; + AddProtected "<INT>"; + AddEssential "<INT>"; +}; +pkgProblemResolver::FixByInstall "<BOOL>"; + +APT::FTPArchive::release +{ + Default-Patterns "<BOOL>"; + NumericTimezone "<BOOL>"; + + // set specific fields in the generated Release file + Acquire-By-Hash "<BOOL>"; + ButAutomaticUpgrades "<BOOL>"; + NotAutomatic "<BOOL>"; + MD5 "<BOOL>"; + SHA1 "<BOOL>"; + SHA256 "<BOOL>"; + SHA512 "<BOOL>"; + Architectures "<STRING>"; + Codename "<STRING>"; + Components "<STRING>"; + Date "<STRING>"; + Description "<STRING>"; + Label "<STRING>"; + Origin "<STRING>"; + Signed-by "<STRING>"; + Suite "<STRING>"; + Version "<STRING>"; +}; -/* Whatever you do, do not use this configuration file!! Take out ONLY - the portions you need! */ -This Is Not A Valid Config File +// having both seems wrong +dpkgpm::progress "<BOOL>"; +dpkg::progress "<BOOL>"; +apt::acquire::by-hash "<STRING>"; +acquire::by-hash "<STRING>"; +apt::acquire::*::by-hash "<STRING>"; +acquire::*::by-hash "<STRING>"; + +// Unsorted options: Some of those are used only internally + +help "<BOOL>"; // true if the help message was requested via e.g. --help +version "<BOOL>"; // true if the version number was requested via e.g. --version +Binary "<STRING>"; // name of the program run like apt-get, apt-cache, … + +dir::locale "<DIR>"; +dir::bin::dpkg-source "<STRING>"; + +pkgcachefile::generate "<BOOL>"; +packagemanager::unpackall "<BOOL>"; +packagemanager::configure "<STRING>"; +commandline::asstring "<STRING>"; +edsp::scenario "<STRING>"; +eipp::scenario "<STRING>"; +cd::* "<STRING>"; // added CDRoms are stored as config + +orderlist::score::delete "<INT>"; +orderlist::score::essential "<INT>"; +orderlist::score::immediate "<INT>"; +orderlist::score::predepends "<INT>"; + +apt::sources::with "<LIST>"; +apt::moo::color "<BOOL>"; +apt::pkgpackagemanager::maxloopcount "<INT>"; +apt::hashes::*::untrusted "<BOOL>"; +apt::list-cleanup "<BOOL>"; +apt::authentication::trustcdrom "<BOOL>"; +apt::solver::strict-pinning "<BOOL>"; +apt::keep-downloaded-packages "<BOOL>"; +apt::solver "<STRING>"; +apt::planner "<STRING>"; +apt::system "<STRING>"; +apt::acquire::translation "<STRING>"; // deprecated in favor of Acquire::Languages +apt::sandbox::user "<STRING>"; +apt::color::highlight "<STRING>"; +apt::color::neutral "<STRING>"; + +dpkgpm::reporting-steps "<INT>"; + +dpkg::chroot-directory "<DIR>"; +dpkg::tools::options::** "<UNDEFINED>"; +dpkg::source-options "<STRING>"; +dpkg::progress-fancy "<BOOL>"; +dpkg::selection::remove::approved "<BOOL>"; +dpkg::remove::crossgrade::implicit "<BOOL>"; +dpkg::selection::current::saveandrestore "<BOOL>"; +dpkg::use-pty "<BOOL>"; + +apt::cmd::disable-script-warning "<BOOL>"; +apt::cmd::show-update-stats "<BOOL>"; +apt::cmd::use-format "<BOOL>"; +apt::cmd::manual-installed "<BOOL>"; +apt::cmd::upgradable "<BOOL>"; +apt::cmd::installed "<BOOL>"; +apt::cmd::list-include-summary "<BOOL>"; +apt::cmd::use-regexp "<BOOL>"; +apt::cmd::all-versions "<BOOL>"; +apt::cmd::format "<STRING>"; + +apt::config::dump::emptyvalue "<BOOL>"; +apt::config::dump::format "<STRING>"; + +apt::mark::simulate "<BOOL>"; +apt::markauto::verbose "<BOOL>"; +apt::sortpkgs::source "<BOOL>"; +apt::extracttemplates::tempdir "<STRING>"; + +apt::key::archivekeyring "<STRING>"; +apt::key::removedkeys "<STRING>"; +apt::key::gpgvcommand "<STRING>"; +apt::key::gpgcommand "<STRING>"; +apt::key::masterkeyring "<STRING>"; +apt::key::archivekeyringuri "<STRING>"; +apt::key::net-update-enabled "<STRING>"; + +apt::ftparchive::release::patterns "<LIST>"; +apt::ftparchive::release::validtime "<INT>"; +apt::ftparchive::by-hash-keep "<INT>"; +apt::ftparchive::delinkact "<BOOL>"; +apt::ftparchive::md5 "<BOOL>"; +apt::ftparchive::sha1 "<BOOL>"; +apt::ftparchive::sha256 "<BOOL>"; +apt::ftparchive::sha512 "<BOOL>"; +apt::ftparchive::dobyhash "<BOOL>"; +apt::ftparchive::showcachemisses "<BOOL>"; +apt::ftparchive::sources::md5 "<BOOL>"; +apt::ftparchive::sources::sha1 "<BOOL>"; +apt::ftparchive::sources::sha256 "<BOOL>"; +apt::ftparchive::sources::sha512 "<BOOL>"; +apt::ftparchive::packages::md5 "<BOOL>"; +apt::ftparchive::packages::sha1 "<BOOL>"; +apt::ftparchive::packages::sha256 "<BOOL>"; +apt::ftparchive::packages::sha512 "<BOOL>"; +apt::ftparchive::dobyhash "<BOOL>"; +apt::ftparchive::readonlydb "<BOOL>"; +apt::ftparchive::nooverridemsg "<BOOL>"; +apt::ftparchive::alwaysstat "<BOOL>"; +apt::ftparchive::contents "<BOOL>"; +apt::ftparchive::contentsonly "<BOOL>"; +apt::ftparchive::longdescription "<BOOL>"; +apt::ftparchive::includearchitectureall "<BOOL>"; +apt::ftparchive::architecture "<STRING>"; +apt::ftparchive::db "<STRING>"; +apt::ftparchive::sourceoverride "<STRING>"; + +apt-helper::cat-file::compress "<STRING>"; + +acquire::cdrom::mount "<DIR>"; +acquire::maxreleasefilesize "<INT>"; +acquire::queuehost::limit "<INT>"; +acquire::max-pipeline-depth "<INT>"; +acquire::allowinsecurerepositories "<BOOL>"; +acquire::allowweakrepositories "<BOOL>"; +acquire::allowdowngradetoinsecurerepositories "<BOOL>"; +acquire::progress::diffpercent "<BOOL>"; +acquire::gzipindexes "<BOOL>"; +acquire::indextargets::randomized "<BOOL>"; +acquire::indextargets::deb::** "<UNDEFINED>"; +acquire::indextargets::deb-src::** "<UNDEFINED>"; +acquire::progress::ignore::showerrortext "<BOOL>"; +acquire::*::dl-limit "<INT>"; // catches file: and co which do not have these +methods::mirror::problemreporting "<STRING>"; +acquire::http::proxyautodetect "<STRING>"; +acquire::http::proxy-auto-detect "<STRING>"; +acquire::http::proxy::* "<STRING>"; +acquire::https::proxyautodetect "<STRING>"; +acquire::https::proxy-auto-detect "<STRING>"; +acquire::https::proxy::* "<STRING>"; + +// Options used by apt-ftparchive +dir::archivedir "<DIR>"; +dir::cachedir "<DIR>"; +dir::overridedir "<DIR>"; +filemode "<INT>"; +longdescription "<BOOL>"; +external-links "<BOOL>"; +default::contentsage "<INT>"; +default::maxcontentschange "<INT>"; +default::filemode "<INT>"; +default::longdescription "<BOOL>"; +default::translation::compress "<STRING>"; +default::contents::compress "<STRING>"; +default::sources::compress "<STRING>"; +default::packages::compress "<STRING>"; +default::sources::extensions "<STRING>"; +default::packages::extensions "<STRING>"; +treedefault::directory "<STRING>"; +treedefault::srcdirectory "<STRING>"; +treedefault::packages "<STRING>"; +treedefault::translation "<STRING>"; +treedefault::internalprefix "<STRING>"; +treedefault::contents "<STRING>"; +treedefault::contents::header "<STRING>"; +treedefault::bincachedb "<STRING>"; +treedefault::srccachedb "<STRING>"; +treedefault::sources "<STRING>"; +treedefault::filelist "<STRING>"; +treedefault::sourcefilelist "<STRING>"; +sections "<STRING>"; +architectures "<STRING>"; +binoverride "<STRING>"; +internalprefix "<STRING>"; +bincachedb "<STRING>"; +directory "<STRING>"; +packages "<STRING>"; +translation "<STRING>"; +contents "<STRING>"; +filelist "<STRING>"; +extraoverride "<STRING>"; +pathprefix "<STRING>"; +srcdirectory "<STRING>"; +sources "<STRING>"; +sourcefilelist "<STRING>"; +srcextraoverride "<STRING>"; +srccachedb "<STRING>"; +srcoverride "<STRING>"; +contents::header "<STRING>"; +packages::compress "<STRING>"; +sources::compress "<STRING>"; +contents::compress "<STRING>"; +translation::compress "<STRING>"; +sources::extensions "<STRING>"; +packages::extensions "<STRING>"; +dir::filelistdir "<STRING>"; + +// Internal code. +dir::dpkg::tupletable "<FILE>"; +dir::dpkg::triplettable "<FILE>"; +dir::dpkg::cputable "<FILE>"; diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt index 566890665..68902812c 100644 --- a/doc/external-dependency-solver-protocol.txt +++ b/doc/external-dependency-solver-protocol.txt @@ -229,8 +229,8 @@ field. The following fields are supported in package stanzas: Note: the Status field present in the dpkg database must not be passed to the external solver, as it's an internal dpkg field. Installed and - other fields permit to encode the most relevant aspects of Status in - communications with solvers. + other fields permit one to encode the most relevant aspects of Status + in communications with solvers. - **Hold:** (optional, defaults to `no`). Allowed values: `yes`, `no`. When set to `yes`, the corresponding package is marked as "on diff --git a/doc/guide.dbk b/doc/guide.dbk index 80937164e..dbc4f5431 100644 --- a/doc/guide.dbk +++ b/doc/guide.dbk @@ -22,7 +22,7 @@ <abstract> <para> -This document provides an overview of how to use the the APT package manager. +This document provides an overview of how to use the APT package manager. </para> </abstract> @@ -327,7 +327,7 @@ will be printed out and <command>apt-get</command> will refuse to run. # apt-get check Reading Package Lists... Done Building Dependency Tree... Done -You might want to run apt-get -f install' to correct these. +You might want to run 'apt --fix-broken install' to correct these. Sorry, but the following packages have unmet dependencies: 9fonts: Depends: xlib6g but it is not installed uucp: Depends: mailx but it is not installed diff --git a/doc/libapt-pkg2_to_3.txt b/doc/libapt-pkg2_to_3.txt index 58e7b30cf..2806f4081 100644 --- a/doc/libapt-pkg2_to_3.txt +++ b/doc/libapt-pkg2_to_3.txt @@ -1,8 +1,9 @@ -libapt-pkg v2 to v3 incorperates several source-incompatible changes that -people need to be aware of.. Many of this changes are done so that most old -source will continue to function, but perhaps at reduced functionality. +libapt-pkg v2 to v3 incorporates several source-incompatible changes +that people need to be aware of.. Many of this changes are done so that +most old source will continue to function, but perhaps at reduced +functionality. -* pkgDepCache is no longer self initilizing, you have to call the Init +* pkgDepCache is no longer self initializing, you have to call the Init method separately after constructing it. Users of pkgCacheFile do not need to worry about this * GetCandidateVer/etc is gone from the pkgCache. It exists only in the diff --git a/doc/method.dbk b/doc/method.dbk index 09ef63e8c..e5e035a2b 100644 --- a/doc/method.dbk +++ b/doc/method.dbk @@ -685,7 +685,7 @@ http - For HTTP servers </orderedlist> <para> The two internal methods, copy and gzip, are used by the acquire code to -parallize and simplify the automatic decompression of package files as well as +parallelize and simplify the automatic decompression of package files as well as copying package files around the file system. Both methods can be seen to act the same except that one decompresses on the fly. APT uses them by generating a copy URI that is formed identically to a file URI. The destination file is diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index cdb4bec40..7a9cbbc81 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 1.4~beta1\n" +"Project-Id-Version: apt-doc 1.4.8\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -1386,6 +1386,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:1 msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: <literal>APT::Get::Indep-Only</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:1 +msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "can be useful while working with local repositories, but is a huge security " "risk if data authenticity isn't ensured in another way by the user itself. " @@ -2014,7 +2021,7 @@ msgstr "" #: apt-key.8.xml:1 msgid "" "Pass advanced options to gpg. With <command>adv --recv-key</command> you can " -"e.g. download key from keyservers directly into the the trusted set of " +"e.g. download key from keyservers directly into the trusted set of " "keys. Note that there are <emphasis>no</emphasis> checks performed, so it is " "easy to completely undermine the &apt-secure; infrastructure if used without " "care." @@ -6794,9 +6801,7 @@ msgstr "" #. type: Content of: <book><bookinfo><abstract><para> #: guide.dbk:1 -msgid "" -"This document provides an overview of how to use the the APT package " -"manager." +msgid "This document provides an overview of how to use the APT package manager." msgstr "" #. type: Content of: <book><bookinfo> @@ -7239,7 +7244,7 @@ msgid "" "# apt-get check\n" "Reading Package Lists... Done\n" "Building Dependency Tree... Done\n" -"You might want to run apt-get -f install' to correct these.\n" +"You might want to run 'apt --fix-broken install' to correct these.\n" "Sorry, but the following packages have unmet dependencies:\n" " 9fonts: Depends: xlib6g but it is not installed\n" " uucp: Depends: mailx but it is not installed\n" diff --git a/doc/po/de.po b/doc/po/de.po index e78a7e233..76f4fc8e3 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\n" "PO-Revision-Date: 2016-11-15 21:51+0200\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -1933,6 +1933,19 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml +#, fuzzy +#| msgid "" +#| "Only process architecture-dependent build-dependencies. Configuration " +#| "Item: <literal>APT::Get::Arch-Only</literal>." +msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: <literal>APT::Get::Indep-Only</literal>." +msgstr "" +"verarbeitet nur architekturabhängige Bauabhängigkeiten. " +"Konfigurationselement: <literal>APT::Get::Arch-Only</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "can be useful while working with local repositories, but is a huge security " @@ -2828,7 +2841,7 @@ msgstr "listet vertrauenswĂ¼rdige SchlĂ¼ssel mit FingerabdrĂ¼cken auf." #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With <command>adv --recv-key</command> you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are <emphasis>no</emphasis> checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -9717,7 +9730,7 @@ msgstr "Version &apt-product-version;" #. type: Content of: <book><bookinfo><abstract><para> #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "" "Dieses Dokument stellt eine Ăœbersicht bereit, wie das APT-" "Paketverwaltungsprogramm benutzt wird." @@ -10371,7 +10384,7 @@ msgid "" "# apt-get check\n" "Reading Package Lists... Done\n" "Building Dependency Tree... Done\n" -"You might want to run apt-get -f install' to correct these.\n" +"You might want to run 'apt --fix-broken install' to correct these.\n" "Sorry, but the following packages have unmet dependencies:\n" " 9fonts: Depends: xlib6g but it is not installed\n" " uucp: Depends: mailx but it is not installed\n" @@ -10388,7 +10401,7 @@ msgstr "" "Paketlisten werden gelesen … Fertig Fertig\n" "Abhängigkeitsbaum wird aufgebaut\n" "Status-Informationen einlesen … Fertig Fertig\n" -"Probieren Sie â€apt-get -f install“, um diese zu korrigieren:\n" +"Probieren Sie â€apt --fix-broken install“, um diese zu korrigieren:\n" "Die folgenden Pakete haben nichterfĂ¼llte Abhängigkeiten:\n" " 9fonts: Hängt ab: xlib6g ist aber nicht installiert\n" " uucp: Hängt ab: mailx ist aber nicht installiert\n" diff --git a/doc/po/es.po b/doc/po/es.po index 1ea8259ca..cf1dfa1d9 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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -2018,6 +2018,19 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml +#, fuzzy +#| msgid "" +#| "Only process architecture-dependent build-dependencies. Configuration " +#| "Item: <literal>APT::Get::Arch-Only</literal>." +msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: <literal>APT::Get::Indep-Only</literal>." +msgstr "" +"Procesa sĂ³lo las dependencias de construcciĂ³n dependientes de la " +"arquitectura. OpciĂ³n de configuraciĂ³n: <literal>APT::Get::Arch-Only</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "can be useful while working with local repositories, but is a huge security " @@ -2885,7 +2898,7 @@ msgstr "Lista las claves de confianza." #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With <command>adv --recv-key</command> you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are <emphasis>no</emphasis> checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -9584,7 +9597,7 @@ msgstr "" #. type: Content of: <book><bookinfo><abstract><para> #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "" "Este documento ofrece una introducciĂ³n sobre cĂ³mo usar el gestor de paquetes " "APT." @@ -10218,7 +10231,7 @@ msgid "" "# apt-get check\n" "Reading Package Lists... Done\n" "Building Dependency Tree... Done\n" -"You might want to run apt-get -f install' to correct these.\n" +"You might want to run 'apt --fix-broken install' to correct these.\n" "Sorry, but the following packages have unmet dependencies:\n" " 9fonts: Depends: xlib6g but it is not installed\n" " uucp: Depends: mailx but it is not installed\n" @@ -10234,7 +10247,7 @@ msgstr "" "# apt-get check\n" "Leyendo lista de paquetes... Hecho\n" "Creando Ă¡rbol de dependencias... Hecho\n" -"Tal vez quiera ejecutar 'apt-get -f install' para corregirlo.\n" +"Tal vez quiera ejecutar 'apt --fix-broken install' para corregirlo.\n" "Los siguientes paquetes tienen dependencias incumplidas:\n" " 9fonts: Depende: xlib6g pero no estĂ¡ instalado\n" " uucp: Depende: mailx pero no estĂ¡ instalado\n" diff --git a/doc/po/fr.po b/doc/po/fr.po index bc28277d5..fb29183e0 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -3,16 +3,17 @@ # This file is distributed under the same license as the apt package. # # Translators: +# # JĂ©rĂ´me Marant, 2000. # Philippe Batailler, 2005. # Christian Perrier <bubulle@debian.org>, 2009, 2010, 2011, 2012, 2013. -# Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>, 2014. +# Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>, 2014, 2017. 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: 2016-11-25 23:46+0100\n" -"PO-Revision-Date: 2014-11-15 17:26+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\n" +"PO-Revision-Date: 2017-01-24 22:43+0100\n" "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "Language: fr\n" @@ -645,6 +646,11 @@ msgid "" "enables some options better suited for interactive usage by default compared " "to more specialized APT tools like &apt-get; and &apt-cache;." msgstr "" +"<command>apt</command> fournit une interface en ligne de commande pour le " +"système de gestion de paquets. Elle est conçue comme une interface " +"utilisateur et permet certaines options plus adaptĂ©es Ă une utilisation " +"interactive par dĂ©faut par rapport aux outils d'APT plus spĂ©cialisĂ©s tels " +"que &apt-get; et &apt-cache;." #. type: Content of: <refentry><refsect1><para> #: apt.8.xml @@ -654,6 +660,11 @@ msgid "" "partly to not duplicate information in multiple places and partly to avoid " "overwhelming readers with a cornucopia of options and details." msgstr "" +"Exactement comme <command>apt</command> lui-mĂªme, cette page de manuel vise " +"Ă Ăªtre une interface pour l'utilisateur et ainsi elle ne mentionne que les " +"commandes et les options les plus courantes, en partie pour ne pas rĂ©pĂ©ter " +"les informations Ă de multiples emplacements et en partie pour ne pas noyer " +"le lecteur par une surabondance d'options et de dĂ©tails." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.8.xml @@ -668,15 +679,14 @@ msgid "" "package upgrades or search in and display details about all packages " "available for installation." msgstr "" +"La commande <option>update</option> permet de tĂ©lĂ©charger les informations " +"sur les paquets Ă partir des sources configurĂ©es. D'autres commandes " +"agissent sur ces donnĂ©es, par exemple, rĂ©alisent la mise Ă jour de paquet ou " +"recherchent et affichent des dĂ©tails Ă propos de tous les paquets qui " +"peuvent Ăªtre installĂ©s." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml -#, fuzzy -#| msgid "" -#| "<literal>upgrade</literal> is used to install the newest versions of all " -#| "packages currently installed on the system from the sources enumerated in " -#| "<filename>/etc/apt/sources.list</filename>. New packages will be " -#| "installed, but existing packages will never be removed." msgid "" "<option>upgrade</option> is used to install available upgrades of all " "packages currently installed on the system from the sources configured via " @@ -685,32 +695,29 @@ msgid "" "a package requires the remove of an installed package the upgrade for this " "package isn't performed." msgstr "" -"La commande <literal>upgrade</literal> permet d'installer les versions les " -"plus rĂ©centes de tous les paquets prĂ©sents sur le système en utilisant les " -"sources Ă©numĂ©rĂ©es dans <filename>/etc/apt/sources.list</filename>. De " -"nouveaux paquets seront installĂ©s, mais les paquets installĂ©s ne seront " -"jamais supprimĂ©s." +"La commande <literal>upgrade</literal> permet d'installer les mises Ă jour " +"disponibles de tous les paquets prĂ©sents sur le système en utilisant les " +"sources Ă©numĂ©rĂ©es dans &sources-list;. De nouveaux paquets seront installĂ©s " +"si cela est nĂ©cessaire pour satisfaire des dĂ©pendances, mais les paquets " +"installĂ©s ne seront jamais supprimĂ©s. Si la mise Ă jour d'un paquet " +"nĂ©cessite la suppression d'un paquet installĂ©, la mise Ă jour n'est pas " +"rĂ©alisĂ©e." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml -#, fuzzy -#| msgid "" -#| "<literal>full-upgrade</literal> performs the function of upgrade but may " -#| "also remove installed packages if that is required in order to resolve a " -#| "package conflict." msgid "" "<literal>full-upgrade</literal> performs the function of upgrade but will " "remove currently installed packages if this is needed to upgrade the system " "as a whole." msgstr "" "La commande <literal>full-upgrade</literal> remplit la mĂªme fonction que " -"upgrade mais peut aussi supprimer des paquets installĂ©s si cela est " -"nĂ©cessaire pour rĂ©soudre un conflit entre des paquets." +"upgrade mais supprimera des paquets actuellement installĂ©s si cela est " +"nĂ©cessaire pour mettre Ă jour le système dans son ensemble." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.8.xml apt-key.8.xml msgid "," -msgstr "" +msgstr "," #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml @@ -720,17 +727,13 @@ msgid "" "packages by append 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 " +"peuvent Ăªtre remplacĂ©es pour certains paquets en ajoutant un plus (+) au nom " +"du paquet pour l'installer et ou un moins (-) pour le supprimer." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml -#, fuzzy -#| msgid "" -#| "A specific version of a package can be selected for installation by " -#| "following the package name with an equals and the version of the package " -#| "to select. This will cause that version to be located and selected for " -#| "install. Alternatively a specific distribution can be selected by " -#| "following the package name with a slash and the version of the " -#| "distribution or the Archive name (stable, testing, unstable)." msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals (=) and the version of the package " @@ -741,11 +744,12 @@ msgid "" "dependencies of this package if needed to satisfy the request." msgstr "" "On peut choisir d'installer une version particulière d'un paquet en faisant " -"suivre son nom par un signe Ă©gal et par la version. Cette version sera " -"recherchĂ©e et l'installation sera demandĂ©e. On peut aussi choisir une " -"distribution particulière en faisant suivre le nom du paquet par une barre " -"oblique et par le nom de la distribution ou de l'archive (stable, testing, " -"unstable)." +"suivre son nom par un signe Ă©gal (=) et par la version du paquet Ă " +"sĂ©lectionner. Autrement, on peut choisir une version spĂ©cifique en faisant " +"suivre le nom du paquet par une barre oblique (/) et le nom de code (&debian-" +"stable-codename;, &debian-testing-codename;, sid …) ou un nom de suite " +"(stable, testing, unstable). Cela sĂ©lectionnera aussi cette version pour les " +"dĂ©pendances de ce paquet si cela est nĂ©cessaire pour satisfaire la requĂªte." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml @@ -758,23 +762,28 @@ msgid "" "on already removed packages. Note that this does not affect any data or " "configuration stored in your home directory." msgstr "" +"La suppression d'un paquet entraĂ®ne la suppression de toutes les donnĂ©es " +"empaquetĂ©es, mais conserve habituellement les petits fichiers (modifiĂ©s) de " +"configuration de l'utilisateur, pour le cas oĂ¹ la suppression a Ă©tĂ© " +"accidentelle. Dans ce cas, il suffira d'Ă©mettre une demande d'installation " +"pour le paquet supprimĂ© accidentellement pour restaurer son fonctionnement " +"antĂ©rieur. D'autre part, on peut facilement se dĂ©barrasser de ces reliquats " +"en appelant la commande <command>purge</command> mĂªme sur des paquets dĂ©jĂ " +"supprimĂ©s. Notez que cela n'affecte aucune donnĂ©e ou configuration stockĂ©es " +"dans votre rĂ©pertoire personnel." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml -#, fuzzy -#| msgid "" -#| "<literal>autoremove</literal> is used to remove packages that were " -#| "automatically installed to satisfy dependencies for other packages and " -#| "are now no longer needed." msgid "" "<literal>autoremove</literal> is used to remove packages that were " "automatically installed to satisfy dependencies for other packages and are " "now no longer needed as dependencies changed or the package(s) needing them " "were removed in the meantime." msgstr "" -"Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets " -"installĂ©s dans le but de satisfaire les dĂ©pendances d'autres paquets et qui " -"ne sont plus nĂ©cessaires." +"La commande <literal>autoremove</literal>, supprime les paquets installĂ©s " +"automatiquement dans le but de satisfaire les dĂ©pendances d'autres paquets " +"et qui ne sont plus nĂ©cessaires parce que les dĂ©pendances ont changĂ© ou " +"parce que le ou les paquets ont Ă©tĂ© supprimĂ©s entre-temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml @@ -785,6 +794,12 @@ msgid "" "mark;. Packages which you have installed explicitly via <command>install</" "command> are also never proposed for automatic removal." msgstr "" +"Vous devriez vĂ©rifier que la liste ne contient pas des applications que vous " +"avez fini par apprĂ©cier, mĂªme si elles ont Ă©tĂ© installĂ©es seulement comme " +"dĂ©pendance d'un autre paquet. Vous pouvez marquer ces paquets comme " +"installĂ©s manuellement avec &apt-mark;. Les paquets que vous avez installĂ©s " +"explicitement avec la commande <command>install</command> ne seront jamais " +"proposĂ©s non plus pour une suppression automatique." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.8.xml @@ -799,6 +814,11 @@ msgid "" "useful if you are looking for packages having a specific feature. If you " "are looking for a package including a specific file try &apt-file;." msgstr "" +"La commande <option>search</option> peut Ăªtre utilisĂ©e pour rechercher le(s) " +"terme(s) ®ex; donnĂ©(s) dans la liste de paquets disponibles et affiche " +"les paquets correspondants. Par exemple, cela peut Ăªtre utile pour " +"rechercher des paquets dotĂ©s d'une fonctionnalitĂ© particulière. Si vous " +"recherchez un paquet qui fournit un fichier particulier, essayez &apt-file;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml @@ -809,21 +829,20 @@ msgid "" "look at this information before allowing &apt; to remove a package or while " "searching for new packages to install." msgstr "" +"La commande affiche des informations sur le(s) paquet(s) donnĂ©(s) y compris " +"ses dĂ©pendances, sa taille installĂ© et au tĂ©lĂ©chargement, les sources d’oĂ¹ " +"provient le paquet, la description du contenu des paquets et bien plus " +"encore. Cela peut Ăªtre utile pour consulter ces informations avant " +"d'autoriser &apt; Ă supprimer un paquet ou lors d'une recherche de nouveaux " +"paquets Ă installer." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.8.xml msgid "(work-in-progress)" -msgstr "" +msgstr "(travail en cours)" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml -#, fuzzy -#| msgid "" -#| "<literal>list</literal> is used to display a list of packages. It " -#| "supports shell pattern for matching package names and the following " -#| "options: <option>--installed</option>, <option>--upgradable</option>, " -#| "<option>--upgradeable</option>, <option>--all-versions</option> are " -#| "supported." msgid "" "<option>list</option> is somewhat similar to <command>dpkg-query --list</" "command> in that it can display a list of packages satisfying certain " @@ -832,38 +851,31 @@ msgid "" "(<option>--upgradeable</option>) or all available (<option>--all-versions</" "option>) versions." msgstr "" -"La commande <literal>list</literal> est utilisĂ©e pour afficher une liste de " -"paquets. Il gère les motifs du shell pour chercher les noms de paquets, " -"ainsi que les options suivantes : <option>--installed</option>, <option>--" -"upgradable</option>, <option>--all-versions</option>." +"La commande <literal>list</literal> est Ă peu près semblable Ă la commande " +"<command>dpkg-query --list</command> dans la mesure oĂ¹ elle peut afficher " +"une liste de paquets qui satisfont Ă certains critères. Elle gère les motifs " +"&glob; pour la correspondance des noms de paquets ainsi que des options pour " +"afficher les versions installĂ©es <option>--installed</option>, pouvant Ăªtre " +"mises Ă jour <option>--upgradeable</option>, ou toutes les versions " +"disponibles <option>--all-versions</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml -#, fuzzy -#| msgid "" -#| "<literal>edit-sources</literal> lets you edit your sources.list file and " -#| "provides basic sanity checks." msgid "" "<literal>edit-sources</literal> lets you edit your &sources-list; files in " "your preferred texteditor while also providing basic sanity checks." msgstr "" "La commande <literal>edit-sources</literal> permet de modifier le fichier " -"sources.list et fournit des vĂ©rifications de sĂ©curitĂ© de base." +"&sources-list; avec votre Ă©diteur de texte prĂ©fĂ©rĂ© et fournit des " +"vĂ©rifications de sĂ©curitĂ© de base." #. type: Content of: <refentry><refsect1><title> #: apt.8.xml msgid "Script Usage and Differences from Other APT Tools" -msgstr "" +msgstr "Utilisation de scripts et diffĂ©rences avec les autres outils d'APT" #. type: Content of: <refentry><refsect1><para> #: apt.8.xml -#, fuzzy -#| msgid "" -#| "The &apt; commandline is designed as a end-user tool and it may change " -#| "the output between versions. While it tries to not break backward " -#| "compatibility there is no guarantee for it either. All features of &apt; " -#| "are available in &apt-cache; and &apt-get; via APT options. Please prefer " -#| "using these commands in your scripts." msgid "" "The &apt; commandline is designed as an end-user tool and it may change " "behavior between versions. While it tries not to break backward " @@ -871,11 +883,10 @@ msgid "" "interactive use." msgstr "" "La ligne de commande de &apt; est conçue comme un outil pour l'utilisateur " -"et les sorties peuvent varier selon ses versions. Bien qu'il s'efforce de ne " -"pas casser les compatibilitĂ©s ascendantes, cela ne peut pas non plus Ăªtre " -"garanti. Toutes les fonctionnalitĂ©s de &apt; existent dans &apt-cache; et " -"&apt-get; grĂ¢ce aux options de APT. Il est conseillĂ© d'utiliser ces " -"commandes dans vos scripts." +"et son comportement peut varier selon ses versions. Bien qu'il s'efforce de " +"ne pas casser les compatibilitĂ©s ascendantes, cela ne peut pas non plus Ăªtre " +"garanti, si une modification semble bĂ©nĂ©fique pour une utilisation " +"interactive." #. type: Content of: <refentry><refsect1><para> #: apt.8.xml @@ -887,6 +898,13 @@ msgid "" "enabled) in your scripts as they keep backward compatibility as much as " "possible." msgstr "" +"Toutes les fonctionnalitĂ©s d'&apt; sont aussi proposĂ©es dans les outils " +"dĂ©diĂ©s d'APT tels que &apt-get; ou &apt-cache; &apt; modifie seulement la " +"valeur par dĂ©faut de certaines options (voir &apt-conf; et en particulier le " +"champ d'action Binary). Aussi vous devriez prĂ©fĂ©rer l'utilisation de ces " +"commandes (Ă©ventuellement avec certaines options complĂ©mentaires activĂ©es) " +"dans les scripts parce qu'elles conservent autant que possible la " +"compatibilitĂ© ascendante." #. type: Content of: <refentry><refsect1><title> #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml @@ -1302,12 +1320,12 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml msgid "(and the" -msgstr "" +msgstr "(et" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml msgid "alias since 1.1)" -msgstr "" +msgstr "l'alias depuis la version 1.1)" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml @@ -1341,33 +1359,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml -#, fuzzy -#| msgid "" -#| "<literal>changelog</literal> downloads a package changelog and displays " -#| "it through <command>sensible-pager</command>. The server name and base " -#| "directory is defined in the <literal>APT::Changelogs::Server</literal> " -#| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs" -#| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=" -#| "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/" -#| "changelogs</ulink> for Ubuntu). By default it displays the changelog for " -#| "the version that is installed. However, you can specify the same options " -#| "as for the <option>install</option> command." msgid "" "<literal>changelog</literal> tries to download the changelog of a package " "and displays it through <command>sensible-pager</command>. By default it " "displays the changelog for the version that is installed. However, you can " "specify the same options as for the <option>install</option> command." msgstr "" -"<literal>changelog</literal> tĂ©lĂ©charge le journal des modifications d'un " -"paquet et l'affiche avec <command>sensible-pager</command>. Le nom du " -"serveur et le rĂ©pertoire de base sont dĂ©finis dans la variable <literal>APT::" -"Changelogs::Server</literal> (p. ex. <ulink url=\"http://packages.debian.org/" -"changelogs\">http://packages.debian.org/changelogs</ulink> pour Debian ou " -"<ulink url=\"http://changelogs.ubuntu.com/changelogs\">http://changelogs." -"ubuntu.com/changelogs</ulink> pour Ubuntu). Par dĂ©faut, c'est le journal des " -"modifications de la version installĂ©e du paquet qui est affichĂ©. Cependant, " -"il est possible d'utiliser les mĂªmes options que pour la commande " -"<option>install</option>." +"<literal>changelog</literal> tente de tĂ©lĂ©charger le journal des " +"modifications d'un paquet et l'affiche avec <command>sensible-pager</" +"command>. Par dĂ©faut, c'est le journal des modifications de la version " +"installĂ©e du paquet qui est affichĂ©. Cependant, il est possible d'utiliser " +"les mĂªmes options que pour la commande <option>install</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml @@ -1382,6 +1384,17 @@ msgid "" "documentation is omitted here and can instead be found in the file &apt-" "acquire-additional-files; shipped by the <package>apt-doc</package> package." msgstr "" +"La commande affiche par dĂ©faut une liste au format deb822 des informations " +"sur tous les fichiers de donnĂ©es (ou cibles d'index) que <command>apt-get " +"update</command> peut tĂ©lĂ©charger. Elle prend en charge une option <option>--" +"format</option> pour modifier le format de sortie et accepte les lignes de " +"la sortie par dĂ©faut pour filtrer les enregistrements. La commande est " +"utilisĂ©e principalement comme interface avec les outils qui fonctionnent " +"avec APT pour obtenir des informations comme les noms des fichiers " +"tĂ©lĂ©chargĂ©s de telle sorte qu'ils peuvent les utiliser plutĂ´t que de les " +"tĂ©lĂ©charger Ă nouveau de leur cĂ´tĂ©. La documentation dĂ©taillĂ©e, absente ici, " +"peut Ăªtre trouvĂ©e dans le fichier &apt-acquire-additional-files; fourni par " +"le paquet <package>apt-doc</package>." #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml @@ -1512,6 +1525,16 @@ msgid "" "Simulation-Note</option>). Configuration Item: <literal>APT::Get::Simulate</" "literal>." msgstr "" +"Pas d'action ; rĂ©alise une simulation des Ă©vĂ©nements qui pourraient survenir " +"sur la base de l'Ă©tat du système actuel, mais ne modifie pas vĂ©ritablement " +"le système. Le verrouillage sera dĂ©sactivĂ© (<option>Debug::NoLocking</" +"option>), ainsi l'Ă©tat du système peut changer pendant que <command>apt-get</" +"command> est exĂ©cutĂ©. Les simulations peuvent aussi Ăªtre exĂ©cutĂ©es par les " +"utilisateurs ordinaires qui pourraient ne pas avoir accès en lecture Ă toute " +"la configuration d'apt, ce qui fausse la simulation. Une annonce exprimant " +"cet avertissement est aussi affichĂ©e par dĂ©faut pour les utilisateurs " +"ordinaires (<option>APT::Get::Show-User-Simulation-Note</option>). ÉlĂ©ment " +"de configuration : <literal>APT::Get::Simulate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml @@ -1550,22 +1573,17 @@ msgid "" "Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::" "Assume-No</literal>." msgstr "" -"RĂ©pondre automatiquement nĂ©gativement aux questions. ÉlĂ©ment de " +"RĂ©pondre automatiquement nĂ©gativement aux questions. ÉlĂ©ment de " "configuration : <literal>APT::Get::Assume-No</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml -#, fuzzy -#| msgid "" -#| "Show upgraded packages; print out a list of all packages that are to be " -#| "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." msgid "" "Do not show a list of all packages that are to be upgraded. Configuration " "Item: <literal>APT::Get::Show-Upgraded</literal>." msgstr "" -"Afficher les paquets mis Ă niveau ; affiche une liste de tous les paquets Ă " -"mettre Ă niveau. ÉlĂ©ment de configuration : <literal>APT::Get::Show-" -"Upgraded</literal>." +"Ne pas afficher la liste de tous les paquets qui doivent Ăªtre mis Ă niveau. " +"ÉlĂ©ment de configuration : <literal>APT::Get::Show-Upgraded</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml @@ -1573,7 +1591,7 @@ msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." msgstr "" -"Afficher les versions complètes des paquets installĂ©s ou mis Ă niveau. " +"Afficher les versions complètes des paquets installĂ©s ou mis Ă niveau. " "ÉlĂ©ment de configuration : <literal>APT::Get::Show-Versions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -1627,7 +1645,7 @@ msgid "" "<literal>dist-upgrade</literal> to override a large number of undesired " "holds. Configuration Item: <literal>APT::Ignore-Hold</literal>." msgstr "" -"Cette commande ignore la marque « Hold » (« garder ») d'un paquet ; par ce " +"Cette commande ignore la marque « Hold » (« retenu ») d'un paquet ; par ce " "biais, <command>apt-get</command> ignore un « hold » placĂ© sur un paquet. " "cela peut Ăªtre utile avec <literal>dist-upgrade</literal> pour annuler un " "grand nombre de « hold » indĂ©sirables. ÉlĂ©ment de configuration : " @@ -1681,35 +1699,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml -#, fuzzy -#| msgid "" -#| "Force yes; this is a dangerous option that will cause apt to continue " -#| "without prompting if it is doing something potentially harmful. It should " -#| "not be used except in very special situations. Using <literal>force-yes</" -#| "literal> can potentially destroy your system! Configuration Item: " -#| "<literal>APT::Get::force-yes</literal>." msgid "" "This is a dangerous option that will cause apt to continue without prompting " "if it is doing downgrades. It should not be used except in very special " "situations. Using it can potentially destroy your system! Configuration " "Item: <literal>APT::Get::allow-downgrades</literal>. Introduced in APT 1.1." msgstr "" -"Forcer l'acceptation ; cette option est dangereuse parce qu'elle laisse APT " -"continuer sans poser de questions quand il rĂ©alise quelque chose de " -"potentiellement dommageable. Cette option ne doit Ăªtre utilisĂ©e que dans des " -"circonstances très spĂ©ciales. Utiliser <literal>force-yes</literal> peut " -"dĂ©truire le système... ÉlĂ©ment de configuration : <literal>APT::Get::force-" -"yes</literal>." +"Cette option est dangereuse parce qu'elle laisse APT continuer sans poser de " +"questions quand il rĂ©alise un retour en arrière. Elle ne doit Ăªtre utilisĂ©e " +"que dans des circonstances très spĂ©ciales. L'utiliser peut Ă©ventuellement " +"dĂ©truire le système ! ÉlĂ©ment de configuration : <literal>APT::Get::allow-" +"downgrades</literal>. Introduite dans APT 1.1" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml -#, fuzzy -#| msgid "" -#| "Force yes; this is a dangerous option that will cause apt to continue " -#| "without prompting if it is doing something potentially harmful. It should " -#| "not be used except in very special situations. Using <literal>force-yes</" -#| "literal> can potentially destroy your system! Configuration Item: " -#| "<literal>APT::Get::force-yes</literal>." msgid "" "Force yes; this is a dangerous option that will cause apt to continue " "without prompting if it is removing essentials. It should not be used except " @@ -1718,21 +1721,14 @@ msgid "" "Introduced in APT 1.1." msgstr "" "Forcer l'acceptation ; cette option est dangereuse parce qu'elle laisse APT " -"continuer sans poser de questions quand il rĂ©alise quelque chose de " -"potentiellement dommageable. Cette option ne doit Ăªtre utilisĂ©e que dans des " -"circonstances très spĂ©ciales. Utiliser <literal>force-yes</literal> peut " -"dĂ©truire le système... ÉlĂ©ment de configuration : <literal>APT::Get::force-" -"yes</literal>." +"continuer sans poser de questions quand il supprime des paquets essentiels. " +"Cette option ne doit Ăªtre utilisĂ©e que dans des circonstances très " +"spĂ©ciales. L'utiliser peut Ă©ventuellement dĂ©truire le système ! ÉlĂ©ment de " +"configuration : <literal>APT::Get::allow-remove-essential</literal>. " +"Introduite dans APT 1.1." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml -#, fuzzy -#| msgid "" -#| "Force yes; this is a dangerous option that will cause apt to continue " -#| "without prompting if it is doing something potentially harmful. It should " -#| "not be used except in very special situations. Using <literal>force-yes</" -#| "literal> can potentially destroy your system! Configuration Item: " -#| "<literal>APT::Get::force-yes</literal>." msgid "" "Force yes; this is a dangerous option that will cause apt to continue " "without prompting if it is changing held packages. It should not be used " @@ -1741,21 +1737,14 @@ msgid "" "literal>. Introduced in APT 1.1." msgstr "" "Forcer l'acceptation ; cette option est dangereuse parce qu'elle laisse APT " -"continuer sans poser de questions quand il rĂ©alise quelque chose de " -"potentiellement dommageable. Cette option ne doit Ăªtre utilisĂ©e que dans des " -"circonstances très spĂ©ciales. Utiliser <literal>force-yes</literal> peut " -"dĂ©truire le système... ÉlĂ©ment de configuration : <literal>APT::Get::force-" -"yes</literal>." +"continuer sans poser de questions quand il modifie des paquets retenus. " +"(« hold »). Cette option ne doit Ăªtre utilisĂ©e que dans des circonstances " +"très spĂ©ciales. L'utiliser peut Ă©ventuellement dĂ©truire le système ! ÉlĂ©ment " +"de configuration : <literal>APT::Get::allow-change-held-packages</literal>. " +"Introduite dans APT 1.1." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml -#, fuzzy -#| msgid "" -#| "Force yes; this is a dangerous option that will cause apt to continue " -#| "without prompting if it is doing something potentially harmful. It should " -#| "not be used except in very special situations. Using <literal>force-yes</" -#| "literal> can potentially destroy your system! Configuration Item: " -#| "<literal>APT::Get::force-yes</literal>." msgid "" "Force yes; this is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -1769,8 +1758,11 @@ msgstr "" "continuer sans poser de questions quand il rĂ©alise quelque chose de " "potentiellement dommageable. Cette option ne doit Ăªtre utilisĂ©e que dans des " "circonstances très spĂ©ciales. Utiliser <literal>force-yes</literal> peut " -"dĂ©truire le système... ÉlĂ©ment de configuration : <literal>APT::Get::force-" -"yes</literal>." +"Ă©ventuellement dĂ©truire le système ! ÉlĂ©ment de configuration : " +"<literal>APT::Get::force-yes</literal>. Cette option est obsolète et " +"remplacĂ©e par <option>--allow-downgrades</option>, <option>--allow-remove-" +"essential</option>, et <option>--allow-change-held-packages</option> dans " +"APT 1.1." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml @@ -1939,6 +1931,16 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: <literal>APT::Get::Indep-Only</literal>." +msgstr "" +"Ne traiter que les dĂ©pendances de construction indĂ©pendantes de " +"l'architecture. ÉlĂ©ment de configuration : <literal>APT::Get::Indep-Only</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml +msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "can be useful while working with local repositories, but is a huge security " "risk if data authenticity isn't ensured in another way by the user itself. " @@ -1946,6 +1948,14 @@ msgid "" "should usually be preferred over this global override. Configuration Item: " "<literal>APT::Get::AllowUnauthenticated</literal>." msgstr "" +"Ignorer le fait que les paquets ne peuvent pas Ăªtre authentifiĂ©s ; ne le " +"signale pas Ă l'utilisateur. Cette option peut Ăªtre utile si on travaille " +"avec des dĂ©pĂ´ts locaux, mais cela reprĂ©sente un risque considĂ©rable si " +"l'authenticitĂ© des donnĂ©es n'est pas assurĂ©e d'une autre manière par " +"l'utilisateur lui-mĂªme. L'utilisation de l'option <option>Trusted</option> " +"pour les entrĂ©es de &sources-list; devrait Ăªtre habituellement prĂ©fĂ©rĂ©e Ă ce " +"remplacement global. ÉlĂ©ment de configuration : <literal>APT::Get::" +"AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml @@ -1956,6 +1966,11 @@ msgid "" "concept and the implications. Configuration Item: <literal>Acquire::" "AllowInsecureRepositories</literal>." msgstr "" +"Interdire la commande update pour obtenir des donnĂ©es non vĂ©rifiables des " +"sources configurĂ©es. APT Ă©chouera si la commande update vise des dĂ©pĂ´ts sans " +"signatures cryptographiques valables. Voir aussi &apt-secure; pour plus de " +"dĂ©tails sur le concept et ses implications. ÉlĂ©ment de configuration : " +"<literal>Acquire::AllowInsecureRepositories</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml @@ -1980,6 +1995,9 @@ msgid "" "multiple files. See <option>--with-source</option> description in &apt-" "cache; for further details." msgstr "" +"Ajoute le fichier donnĂ© comme source de mĂ©ta-donnĂ©es. La commande peut Ăªtre " +"rĂ©pĂ©tĂ©e pour ajouter de multiples fichiers. Voir la description de l'option " +"<option>--with-source</option> dans &apt-cache; pour plus de dĂ©tails." #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml @@ -2014,12 +2032,6 @@ msgstr "recherche dans le cache d'APT" #. type: Content of: <refentry><refsect1><para> #: apt-cache.8.xml -#, fuzzy -#| msgid "" -#| "<command>apt-cache</command> performs a variety of operations on APT's " -#| "package cache. <command>apt-cache</command> does not manipulate the state " -#| "of the system but does provide operations to search and generate " -#| "interesting output from the package metadata." msgid "" "<command>apt-cache</command> performs a variety of operations on APT's " "package cache. <command>apt-cache</command> does not manipulate the state of " @@ -2033,7 +2045,12 @@ msgstr "" "<command>apt-cache</command> rĂ©alise diffĂ©rentes opĂ©rations sur le cache de " "paquet d'APT. <command>apt-cache</command> ne manipule pas l'Ă©tat du système " "mais fournit des moyens de recherche dans les mĂ©tadonnĂ©es d'un paquet " -"desquelles il extrait les informations intĂ©ressantes." +"desquelles il extrait les informations intĂ©ressantes. Les mĂ©tadonnĂ©es sont " +"obtenues et mises Ă jour avec la commande update d'<command>apt-get</" +"command> par exemple, et peuvent donc Ăªtre pĂ©rimĂ©es si la dernière mise Ă " +"jour est trop ancienne, mais en contrepartie <command>apt-cache</command> " +"fonctionne indĂ©pendamment de la disponibilitĂ© des sources configurĂ©es (par " +"exemple hors ligne)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml @@ -2212,22 +2229,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml -#, fuzzy -#| msgid "" -#| "<literal>Total distinct</literal> versions is the number of package " -#| "versions found in the cache; this value is therefore at least equal to " -#| "the number of total package names. If more than one distribution is being " -#| "accessed (for instance, \"stable\" and \"unstable\"), this value can be " -#| "considerably larger than the number of total package names." msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache. If more than one distribution is being accessed (for " "instance, \"stable\" and \"unstable\"), this value can be considerably " "larger than the number of total package names." msgstr "" -"<literal>Total distinct versions</literal> est le nombre de versions de " -"paquets trouvĂ©es dans le cache ; cette valeur est par consĂ©quent au moins " -"Ă©gale au nombre total de paquets. Quand on accède Ă plus d'une distribution " +"<literal>Total distinct</literal> versions est le nombre de versions de " +"paquets trouvĂ©es dans le cache. Quand on accède Ă plus d'une distribution " "(« stable » et « unstable », par exemple), cette valeur peut Ăªtre " "considĂ©rablement plus grande que le nombre total de paquets." @@ -2242,11 +2251,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml -#, fuzzy -#| msgid "" -#| "<literal>showsrc</literal> displays all the source package records that " -#| "match the given package names. All versions are shown, as well as all " -#| "records that declare the name to be a binary package." msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " @@ -2255,7 +2259,9 @@ msgid "" msgstr "" "<literal>showsrc</literal> affiche toutes les entrĂ©es de paquets source qui " "correspondent aux noms donnĂ©s. Toutes les versions sont affichĂ©es et toutes " -"les entrĂ©es qui dĂ©clarent que ces noms correspondent Ă des paquets binaires." +"les entrĂ©es qui dĂ©clarent que ces noms correspondent Ă des paquets binaires. " +"Utilisez l'option <option>--only-source</option> pour n'afficher que le nom " +"des paquets source." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml @@ -2302,16 +2308,6 @@ msgstr "&synopsis-regex;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml -#, fuzzy -#| msgid "" -#| "<literal>search</literal> performs a full text search on all available " -#| "package lists for the POSIX regex pattern given, see ®ex;. It " -#| "searches the package names and the descriptions for an occurrence of the " -#| "regular expression and prints out the package name and the short " -#| "description, including virtual package names. If <option>--full</option> " -#| "is given then output identical to <literal>show</literal> is produced for " -#| "each matched package, and if <option>--names-only</option> is given then " -#| "the long description is not searched, only the package name is." msgid "" "<literal>search</literal> performs a full text search on all available " "package lists for the POSIX regex pattern given, see ®ex;. It searches " @@ -2327,9 +2323,10 @@ msgstr "" "Elle cherche une occurrence de la chaĂ®ne dans les noms de paquets et dans " "les descriptions puis elle affiche le nom du paquet et sa description " "courte. Quand l'option <option>--full</option> est fournie, la sortie est " -"identique Ă <literal>show</literal> pour chaque paquet ; l'option <option>--" -"names-only</option> ne recherche pas la chaĂ®ne dans les descriptions longues " -"mais seulement dans les noms de paquets." +"identique Ă <literal>show</literal> pour chaque paquet ; quand l'option " +"<option>--names-only</option> est fournie, la recherche ne porte pas sur les " +"descriptions longues, mais seulement sur les noms de paquets et les paquets " +"fournis." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml @@ -2538,13 +2535,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml -#, fuzzy -#| msgid "" -#| "Per default the <literal>depends</literal> and <literal>rdepends</" -#| "literal> print all dependencies. This can be tweaked with these flags " -#| "which will omit the specified dependency type. Configuration Item: " -#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></" -#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>." msgid "" "Per default the <command>depends</command> and <command>rdepends</command> " "print all dependencies. This can be tweaked with these flags which will omit " @@ -2552,7 +2542,7 @@ msgid "" "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::" "Cache::ShowRecommends</literal>." msgstr "" -"Avec cette option, <literal>depends</literal> et <literal>rdepends</literal> " +"Par dĂ©faut, <command>depends</command> et <command>rdepends</command> " "affichent toutes les dĂ©pendances. Ce comportement peut Ăªtre modifiĂ© avec ces " "rĂ©glages qui omettront le type de dĂ©pendance indiquĂ©. ÉlĂ©ment de " "configuration : <literal>APT::Cache::Show<replaceable>TypeDĂ©pendance</" @@ -2568,6 +2558,14 @@ msgid "" "package also conflicts with the package foo from any other architecture. " "Configuration Item: <literal>APT::Cache::ShowImplicit</literal>." msgstr "" +"Par dĂ©faut, <command>depends</command> et <command>rdepends</command> " +"n'affichent que les dĂ©pendances indiquĂ©es explicitement dans les " +"mĂ©tadonnĂ©es. Avec ce marqueur, ils afficheront aussi les dĂ©pendances " +"ajoutĂ©es de façon implicite basĂ©es sur les donnĂ©es rencontrĂ©es. Par exemple, " +"un message <literal>Conflicts: foo</literal> exprime de façon implicite que " +"ce paquet est aussi en conflit avec le paquet foo de n'importe quelle autre " +"architecture. ÉlĂ©ment de configuration : <literal>APT::Cache::ShowImplicit</" +"literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml @@ -2611,17 +2609,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml -#, fuzzy -#| msgid "" -#| "Only search on the package names, not the long descriptions. " -#| "Configuration Item: <literal>APT::Cache::NamesOnly</literal>." msgid "" "Only search on the package and provided package names, not the long " "descriptions. Configuration Item: <literal>APT::Cache::NamesOnly</literal>." msgstr "" -"N'effectue une recherche que sur les noms de paquets et pas sur les " -"descriptions longues. ÉlĂ©ment de configuration : <literal>APT::Cache::" -"NamesOnly</literal>." +"N'effectue une recherche que sur les noms de paquets et de paquets fournis, " +"pas sur les descriptions longues. ÉlĂ©ment de configuration : <literal>APT::" +"Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml @@ -2666,6 +2660,13 @@ msgid "" "literal> and <literal>Packages</literal> files as well as source package " "directories. Files are matched based on their name only, not their content!" msgstr "" +"Ajoute le fichier donnĂ© comme source de mĂ©tadonnĂ©es. La commande peut Ăªtre " +"rĂ©pĂ©tĂ©e pour ajouter de multiples fichiers. Actuellement, les " +"fichiers<literal>*.deb</literal>, <literal>*.dsc</literal>, <literal>*." +"changes</literal>, <literal>Sources</literal> et <literal>Packages</" +"literal>, aussi bien que les rĂ©pertoires de paquets source sont pris en " +"charge. Les correspondances de fichier sont basĂ©es sur leur nom seulement et " +"non sur leur contenu !" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml @@ -2676,19 +2677,21 @@ msgid "" "name of your choice with the last character being an underscore " "(\"<literal>_</literal>\"). Example: my.example_Packages.xz" msgstr "" +"Les <literal>Sources</literal> et <literal>Packages</literal> peuvent Ăªtre " +"compressĂ©s dans n'importe quel format qu'APT prend en charge Ă condition " +"qu'ils portent la bonne extension. Si vous avez besoin de stocker plusieurs " +"de ces fichiers dans un seul rĂ©pertoire, vous pouvez ajouter comme prĂ©fixe " +"le nom que vous voulez pourvu que le dernier caractère soit un tiret bas " +"(« <literal>_</literal> »). Exemple : mon.exemple_Packages.xz" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml -#, fuzzy -#| msgid "" -#| "Use source index field ordering. Configuration Item: <literal>APT::" -#| "SortPkgs::Source</literal>." msgid "" "Note that these sources are treated as trusted (see &apt-secure;). " "Configuration Item: <literal>APT::Sources::With</literal>." msgstr "" -"Utiliser un index de sources pour le tri des champs. ÉlĂ©ment de " -"configuration : <literal>APT::SortPkgs::Source</literal>." +"Veuillez noter que ces sources sont traitĂ©es comme fiables (voir &apt-" +"secure;). ÉlĂ©ment de configuration : <literal>APT::Sources::With</literal>." #. type: Content of: <refentry><refsect1><para> #: apt-cache.8.xml @@ -2730,11 +2733,20 @@ msgid "" "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." #. type: Content of: <refentry><refsect1><title> #: apt-key.8.xml msgid "Supported keyring files" -msgstr "" +msgstr "Trousseaux de clĂ©s pris en charge" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml @@ -2745,6 +2757,14 @@ msgid "" "keyring files. Binary keyring files intended to be used with any apt version " "should therefore always be created with <command>gpg --export</command>." msgstr "" +"apt-key ne prend en charge que le format binaire OpenPGP (connu aussi sous " +"le nom de « trousseau de clĂ©s public GPG ») dans les fichiers avec " +"l'extension « <literal>gpg</literal> », et pas le format de base de donnĂ©es " +"Keybox, introduit comme format par dĂ©faut pour les fichiers de trousseau de " +"clĂ©s dans les versions les plus rĂ©centes de &gpg;. Les fichiers binaires de " +"trousseau de clĂ©s destinĂ©s Ă Ăªtre utilisĂ©s dans toutes les versions d'apt " +"devraient donc toujours Ăªtre crĂ©Ă©s avec la commande <command>gpg --export</" +"command>." #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml @@ -2754,6 +2774,10 @@ msgid "" "with the \"<literal>asc</literal>\" extension instead which can be created " "with <command>gpg --armor --export</command>." msgstr "" +"Autrement, si tous les systèmes susceptibles d'utiliser le trousseau de clĂ©s " +"crĂ©Ă© disposent d'une version d'apt >= 1.4, il est possible d'utiliser plutĂ´t " +"le format ASCII-Armored, avec l'extension « <literal>asc</literal> », qui " +"peut Ăªtre crĂ©Ă© par la commande <command>gpg --armor --export</command>." #. type: Content of: <refentry><refsect1><title> #: apt-key.8.xml @@ -2778,6 +2802,10 @@ msgid "" "verified to belong to the owner of the repositories they claim to be for " "otherwise the &apt-secure; infrastructure is completely undermined." msgstr "" +"Il est primordial de vĂ©rifier que les clĂ©s ajoutĂ©es manuellement avec " +"<command>apt-key</command> appartiennent bien au propriĂ©taire des dĂ©pĂ´ts " +"comme elles le prĂ©tendent, sinon l'infrastructure de &apt-secure; est " +"complètement compromise." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml @@ -2787,6 +2815,11 @@ msgid "" "directory with a descriptive name and either \"<literal>gpg</literal>\" or " "\"<literal>asc</literal>\" as file extension." msgstr "" +"<emphasis>Attention</emphasis> : plutĂ´t que d'utiliser cette commande, un " +"trousseau de clĂ©s peut Ăªtre placĂ© directement dans le rĂ©pertoire <filename>/" +"etc/apt/trusted.gpg.d/</filename> avec un nom descriptif et soit " +"« <literal>gpg</literal> » soit « <literal>asc</literal> » comme extension " +"de fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml @@ -2805,24 +2838,28 @@ msgstr "Afficher toutes les clĂ©s fiables sur la sortie standard." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml -#, fuzzy -#| msgid "List trusted keys." msgid "List trusted keys with fingerprints." -msgstr "Afficher la liste des clĂ©s fiables." +msgstr "Afficher la liste des clĂ©s fiables avec leurs empreintes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With <command>adv --recv-key</command> you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are <emphasis>no</emphasis> checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" +"Passer des options avancĂ©es Ă gpg. Avec <command>adv --recv-key</command>, " +"il est possible par exemple de tĂ©lĂ©charger une clĂ© directement d'un serveur " +"de clĂ© dans l'ensemble de clĂ©s fiables. Veuillez noter qu'il n'y a " +"<emphasis>aucune</emphasis> vĂ©rification rĂ©alisĂ©e, aussi, il peut Ăªtre " +"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 "" +msgstr "(obsolète)" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml @@ -2847,6 +2884,12 @@ msgid "" "<package>gnupg</package> and it is easier to manage keys by simply adding " "and removing files for maintainers and users alike." msgstr "" +"Veuillez noter qu'une distribution n'a pas besoin et, en fait, ne devrait " +"plus utiliser cette commande et plutĂ´t charger directement les fichiers de " +"trousseau de clĂ©s dans le rĂ©pertoire <filename>/etc/apt/trusted.gpg.d/</" +"filename> parce que cela Ă©vite une dĂ©pendance Ă <package>gnupg</package> et " +"qu'il est plus facile pour les responsables et les utilisateurs de gĂ©rer les " +"clĂ©s en ajoutant ou en retirant simplement des fichiers." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml @@ -2905,7 +2948,7 @@ msgstr "&apt-get;, &apt-secure;" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-mark.8.xml msgid "show, set and unset various settings for a package" -msgstr "" +msgstr "affiche, dĂ©finit ou redĂ©finit divers paramètres d'un paquet" #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml @@ -2917,22 +2960,21 @@ msgid "" "g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</" "command>." msgstr "" +"La commande <command>apt-mark</command> peut Ăªtre utilisĂ©e comme interface " +"unique pour diverses configurations d'un paquet, par exemple pour le marquer " +"comme installĂ© automatiquement ou manuellement, ou pour modifier les " +"sĂ©lections de <command>dpkg</command> telles que <option>hold</option> " +"<option>install</option> <option>deinstall</option> et <option>purge</" +"option> qui sont suivies par exemple par les commandes <command>apt-get " +"dselect-upgrade</command> ou <command>aptitude</command>." #. type: Content of: <refentry><refsect1><title> #: apt-mark.8.xml msgid "Automatically and Manually Installed Packages" -msgstr "" +msgstr "Paquets installĂ©s automatiquement et manuellement" #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml -#, fuzzy -#| msgid "" -#| "When you request that a package is installed, and as a result other " -#| "packages are installed to satisfy its dependencies, the dependencies are " -#| "marked as being automatically installed. Once these automatically " -#| "installed packages are no longer depended on by any manually installed " -#| "packages, they will be removed by e.g. <command>apt-get</command> or " -#| "<command>aptitude</command>." msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -2944,10 +2986,12 @@ msgid "" msgstr "" "Lorsque l'installation d'un paquet est demandĂ©e et que par voie de " "dĂ©pendances d'autres paquets sont installĂ©s, ces paquets sont marquĂ©s comme " -"ayant Ă©tĂ© automatiquement installĂ©s. Une fois que ces paquets " -"automatiquement installĂ©s ne sont plus liĂ©s Ă un paquet existant, ils seront " -"supprimĂ©s par un appel Ă <command>apt-get</command> ou <command>aptitude</" -"command>." +"ayant Ă©tĂ© automatiquement installĂ©s, tandis que le paquet que vous avez " +"installĂ© explicitement est marquĂ© comme manuellement installĂ©. Une fois que " +"ces paquets automatiquement installĂ©s ne sont plus liĂ©s Ă un paquet installĂ© " +"manuellement, ils ne seront plus considĂ©rĂ©s comme nĂ©cessaires et " +"<command>apt-get</command> ou <command>aptitude</command>, par exemple, " +"proposeront au moins de les supprimer." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml @@ -3012,22 +3056,16 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-mark.8.xml msgid "Prevent Changes for a Package" -msgstr "" +msgstr "EmpĂªcher les modifications d'un paquet" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml -#, fuzzy -#| msgid "" -#| "<literal>manual</literal> is used to mark a package as being manually " -#| "installed, which will prevent the package from being automatically " -#| "removed if no other packages depend on it." msgid "" "<literal>hold</literal> is used to mark a package as held back, which will " "prevent the package from being automatically installed, upgraded or removed." msgstr "" -"<literal>manual</literal> permet de marquer un paquet comme installĂ© " -"manuellement. Un tel paquet ne sera pas supprimĂ© automatiquement, mĂªme si " -"aucun autre paquet n'en dĂ©pend." +"<literal>hold</literal> permet de marquer un paquet comme retenu, ce qui " +"empĂªchera qu'il soit installĂ©, mis Ă jour ou supprimĂ© automatiquement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml @@ -3035,9 +3073,8 @@ msgid "" "<literal>unhold</literal> is used to cancel a previously set hold on a " "package to allow all actions again." msgstr "" -"<literal>unhold</literal> est utilisĂ© pour supprimer l'Ă©tat " -"« hold » (conservĂ©) d'un paquet afin de permettre toute action qui y est " -"liĂ©e." +"<literal>unhold</literal> est utilisĂ© pour supprimer l'Ă©tat " +"« hold » (retenu) d'un paquet afin de permettre toute action qui y est liĂ©e." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml @@ -3045,13 +3082,13 @@ msgid "" "<literal>showhold</literal> is used to print a list of packages on hold in " "the same way as for the other show commands." msgstr "" -"<literal>showhold</literal> permet d'afficher la liste des paquets conservĂ©s " +"<literal>showhold</literal> permet d'afficher la liste des paquets retenus " "de manière analogue aux commandes de mĂªme type." #. type: Content of: <refentry><refsect1><title> #: apt-mark.8.xml msgid "Schedule Packages for Install, Remove and Purge" -msgstr "" +msgstr "Programmer des paquets pour Install, Remove et Purge" #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml @@ -3065,6 +3102,16 @@ msgid "" "<option>showpurge</option> respectively. More information about these so " "called dpkg selections can be found in &dpkg;." msgstr "" +"Certains frontaux comme <command>apt-get dselect-upgrade</command> peuvent " +"Ăªtre utilisĂ©s pour appliquer des modifications, prĂ©alablement programmĂ©es, " +"de l'Ă©tat d'installation de paquets. Ces modifications peuvent Ăªtre " +"programmĂ©es avec les commandes <option>install</option>, <option>remove</" +"option> (connue aussi sous le nom de <option>deinstall</option>) et " +"<option>purge</option>. Les paquets faisant l'objet d'une sĂ©lection " +"particulière peuvent Ăªtre affichĂ©s respectivement avec les options " +"<option>showinstall</option>, <option>showremove</option> et " +"<option>showpurge</option>. Vous trouverez plus d'information sur ce que " +"l'on appelle les sĂ©lections de dpkg dans &dpkg;." #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml @@ -3082,12 +3129,6 @@ msgstr "Gestion de l'authentification d'archive avec APT" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml -#, fuzzy -#| msgid "" -#| "Starting with version 0.6, <command>apt</command> contains code that does " -#| "signature checking of the Release file for all archives. This ensures " -#| "that packages in the archive can't be modified by people who have no " -#| "access to the Release file signing key." msgid "" "Starting with version 0.6, <command>APT</command> contains code that does " "signature checking of the Release file for all repositories. This ensures " @@ -3099,7 +3140,9 @@ msgstr "" "Depuis sa version 0.6, <command>apt</command> sait vĂ©rifier la signature du " "fichier Release de chaque archive. On s'assure ainsi que les paquets de " "cette archive ne peuvent pas Ăªtre modifiĂ©s par quelqu'un qui ne possède pas " -"la clĂ© de la signature du fichier Release." +"la clĂ© de la signature du fichier Release. Ă€ partir de la version 1.1, " +"<command>apt</command> exige que les dĂ©pĂ´ts fournissent des informations " +"rĂ©centes d'authentification pour une utilisation libre du dĂ©pĂ´t." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml @@ -3110,6 +3153,12 @@ msgid "" "ends like &apt-get; will require explicit confirmation if an installation " "request includes a package from such an unauthenticated archive." msgstr "" +"Si une archive possède un fichier Release non signĂ© ou pas de fichier " +"Release du tout, les versions actuelles d'APT refuseront par dĂ©faut d'en " +"tĂ©lĂ©charger des donnĂ©es dans les opĂ©rations <command>update</command>. MĂªme " +"si un frontal tel que &apt-get; est forcĂ© de tĂ©lĂ©charger, il demandera une " +"confirmation explicite si une installation inclut un paquet d'une archive " +"non authentifiĂ©e." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml @@ -3122,6 +3171,14 @@ msgid "" "AllowInsecureRepositories</option> to <literal>false</literal> or <option>--" "no-allow-insecure-repositories</option> on the command line." msgstr "" +"Comme exception temporaire, &apt-get; (pas &apt; !) Ă©met seulement une mise " +"en garde s'il rencontre des archives non authentifiĂ©es pour accorder une " +"pĂ©riode de grĂ¢ce un peu plus longue Ă cette modification affectant la " +"compatibilitĂ© ascendante. Cette exception disparaĂ®tra dans les futures " +"versions et vous pouvez renoncer Ă ce dĂ©lai de grĂ¢ce en configurant l'option " +"<option>Binary::apt-get::Acquire::AllowInsecureRepositories</option> Ă " +"<literal>false</literal> ou en passant l'option <option>--no-allow-insecure-" +"repositories</option> sur la ligne de commande." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml @@ -3136,6 +3193,16 @@ msgid "" "disable even the warnings, but be sure to understand the implications as " "detailed in &sources-list;." msgstr "" +"Vous pouvez contraindre les clients APT Ă n'Ă©mettre que des avertissements " +"en configurant l'option <option>Acquire::AllowInsecureRepositories</option> " +"Ă <literal>true</literal>. L'option <literal>allow-insecure=yes</literal> de " +"&sources-list; peut aussi permettre Ă des dĂ©pĂ´ts individuels d'Ăªtre non " +"sĂ©curisĂ©s. Veuillez noter que les dĂ©pĂ´ts non sĂ©curisĂ©s sont fortement " +"dĂ©conseillĂ©s et toutes les options pour contraindre APT Ă continuer Ă les " +"prendre en charge devront Ăªtre Ă©ventuellement supprimĂ©es. Les utilisateurs " +"disposent aussi de l'option <option>Trusted</option> pour dĂ©sactiver mĂªme " +"les avertissements, mais il faut Ăªtre sĂ»r de comprendre ses implications " +"dĂ©taillĂ©es dans &sources-list;." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml @@ -3148,38 +3215,34 @@ msgid "" "<literal>true</literal> or for Individual repositories with the &sources-" "list; option <literal>allow-downgrade-to-insecure=yes</literal>." msgstr "" +"Un dĂ©pĂ´t qui auparavant Ă©tait authentifiĂ©, mais qui perdrait cet Ă©tat lors " +"d'une opĂ©ration <command>update</command> envoie un message d'erreur Ă tous " +"les clients d'APT quelle que soit l'option d'autoriser ou d'interdire " +"l'utilisation de dĂ©pĂ´ts non sĂ©curisĂ©s. L'erreur peut Ăªtre contournĂ©e par le " +"rĂ©glage supplĂ©mentaire de <option>Acquire::" +"AllowDowngradeToInsecureRepositories</option> Ă <literal>true</literal>, ou, " +"pour des dĂ©pĂ´ts individuels avec l'option <literal>allow-downgrade-to-" +"insecure=yes</literal> de &sources-list;." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml -#, fuzzy -#| msgid "" -#| "The package front-ends &apt-get;, &aptitude; and &synaptic; support this " -#| "new authentication feature." msgid "" "Note: All APT-based package management front-ends like &apt-get;, &aptitude; " "and &synaptic; support this authentication feature, so this manpage uses " "<literal>APT</literal> to refer to them all for simplicity only." msgstr "" -"Les interfaces &apt-get;, &aptitude; et &synaptic; possèdent cette nouvelle " -"fonction de certification." +"Attention : toutes les interfaces de gestion de paquets comme &apt-get;, " +"&aptitude; et &synaptic; possèdent cette fonction de certification, aussi " +"cette page de manuel utilise <literal>APT</literal> pour se rĂ©fĂ©rer Ă " +"l'ensemble d'entre elles, pour des raisons de simplicitĂ©." #. type: Content of: <refentry><refsect1><title> #: apt-secure.8.xml -#, fuzzy -#| msgid "Trusted archives" msgid "Trusted Repositories" -msgstr "Trusted archives" +msgstr "Archives de confiance" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml -#, fuzzy -#| msgid "" -#| "The chain of trust from an apt archive to the end user is made up of " -#| "several steps. <command>apt-secure</command> is the last step in this " -#| "chain; trusting an archive does not mean that you trust its packages not " -#| "to contain malicious code, but means that you trust the archive " -#| "maintainer. It's the archive maintainer's responsibility to ensure that " -#| "the archive's integrity is preserved." msgid "" "The chain of trust from an APT archive to the end user is made up of several " "steps. <command>apt-secure</command> is the last step in this chain; " @@ -3188,12 +3251,12 @@ msgid "" "archive maintainer's responsibility to ensure that the archive's integrity " "is preserved." msgstr "" -"D'une archive apt jusqu'Ă l'utilisateur, la confiance se construit en " -"plusieurs Ă©tapes. <command>Apt-secure</command> est la dernière Ă©tape. Faire " -"confiance Ă une archive ne signifie pas que les paquets qu'elle contient " -"sont exempts de code malveillant, mais signifie que vous faites confiance au " -"responsable de l'archive. C'est ensuite au responsable de l'archive de faire " -"en sorte que l'archive soit fiable." +"D'une archive APT jusqu'Ă l'utilisateur, la chaĂ®ne de confiance se construit " +"en plusieurs Ă©tapes. <command>Apt-secure</command> est la dernière Ă©tape. " +"Faire confiance Ă une archive ne signifie pas que les paquets qu'elle " +"contient sont exempts de code malveillant, mais signifie que vous faites " +"confiance au responsable de l'archive. C'est ensuite au responsable de " +"l'archive de faire en sorte que l'archive soit fiable." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml @@ -3210,14 +3273,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml -#, fuzzy -#| msgid "" -#| "The chain of trust in Debian starts when a maintainer uploads a new " -#| "package or a new version of a package to the Debian archive. In order to " -#| "become effective, this upload needs to be signed by a key contained in " -#| "the Debian Maintainers keyring (available in the debian-keyring package). " -#| "Maintainers' keys are signed by other maintainers following pre-" -#| "established procedures to ensure the identity of the key holder." msgid "" "The chain of trust in Debian starts (e.g.) when a maintainer uploads a new " "package or a new version of a package to the Debian archive. In order to " @@ -3227,13 +3282,15 @@ msgid "" "established procedures to ensure the identity of the key holder. Similar " "procedures exist in all Debian-based distributions." msgstr "" -"La chaĂ®ne de confiance dans Debian commence quand un responsable de paquet " -"envoie un nouveau paquet ou une nouvelle version d'un paquet dans l'archive. " -"Cet envoi, pour Ăªtre effectif, doit Ăªtre signĂ© avec la clĂ© d'un responsable " -"qui se trouve dans le trousseau des responsables Debian (disponible dans le " -"paquet debian-keyring). Les clĂ©s des responsables de paquet sont signĂ©es par " -"d'autres responsables, suivant des procĂ©dures prĂ©Ă©tablies pour s'assurer de " -"l'identitĂ© des propriĂ©taires de la clĂ©." +"La chaĂ®ne de confiance dans Debian commence, par exemple, quand un " +"responsable de paquet envoie un nouveau paquet ou une nouvelle version d'un " +"paquet dans l'archive. Cet envoi, pour Ăªtre effectif, doit Ăªtre signĂ© avec " +"la clĂ© d'un responsable qui se trouve dans un des trousseaux des " +"responsables de paquet Debian (disponibles dans le paquet debian-keyring). " +"Les clĂ©s des responsables de paquet sont signĂ©es par d'autres responsables, " +"suivant des procĂ©dures prĂ©Ă©tablies pour s'assurer de l'identitĂ© des " +"propriĂ©taires de la clĂ©. Des procĂ©dures similaires existent dans toutes les " +"distributions basĂ©es sur Debian." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml @@ -3307,12 +3364,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml -#, fuzzy -#| msgid "" -#| "However, it does not defend against a compromise of the Debian master " -#| "server itself (which signs the packages) or against a compromise of the " -#| "key used to sign the Release files. In any case, this mechanism can " -#| "complement a per-package signature." msgid "" "However, it does not defend against a compromise of the master server itself " "(which signs the packages) or against a compromise of the key used to sign " @@ -3320,8 +3371,8 @@ msgid "" "signature." msgstr "" "Cependant cette mĂ©thode ne protège pas contre une compromission du serveur " -"Debian lui-mĂªme (qui signe les paquets) ni contre la compromission de la clĂ© " -"qui sert Ă signer les fichiers Release. Mais elle peut complĂ©ter la " +"principal lui-mĂªme (qui signe les paquets) ni contre la compromission de la " +"clĂ© qui sert Ă signer les fichiers Release. Mais elle peut complĂ©ter la " "signature des paquets." #. type: Content of: <refentry><refsect1><title> @@ -3331,22 +3382,18 @@ msgstr "Configuration utilisateur" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml -#, fuzzy -#| msgid "" -#| "<command>apt-key</command> is the program that manages the list of keys " -#| "used by apt. It can be used to add or remove keys, although an " -#| "installation of this release will automatically contain the default " -#| "Debian archive signing keys used in the Debian package repositories." msgid "" "<command>apt-key</command> is the program that manages the list of keys used " "by APT to trust repositories. It can be used to add or remove keys as well " "as list the trusted keys. Limiting which key(s) are able to sign which " "archive is possible via the <option>Signed-By</option> in &sources-list;." msgstr "" -"Le programme qui gère la liste des clĂ©s utilisĂ©es par apt s'appelle " -"<command>apt-key</command>. Il peut ajouter ou supprimer des clĂ©s. Cette " -"version installe automatiquement les clĂ©s qui servent Ă signer l'archive " -"Debian et les diffĂ©rents rĂ©pertoires de paquets." +"Le programme qui gère la liste des clĂ©s utilisĂ©es par APT pour faire " +"confiance aux dĂ©pĂ´ts s'appelle <command>apt-key</command>. Il peut ajouter " +"ou supprimer des clĂ©s aussi bien que lister les clĂ©s de confiance. Il est " +"possible de limiter la capacitĂ© pour une ou plusieurs clĂ©s de signer telle " +"ou telle archive avec l'option <option>Signed-By</option> dans &sources-" +"list;." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml @@ -3356,6 +3403,10 @@ msgid "" "<command>apt-key</command> is only needed if third-party repositories are " "added." msgstr "" +"Veuillez noter qu'une installation par dĂ©faut possède toutes les clĂ©s pour " +"obtenir en toute sĂ©curitĂ© des paquets des dĂ©pĂ´ts par dĂ©faut, aussi, bricoler " +"avec <command>apt-key</command> n'est nĂ©cessaire que si vous souhaitez " +"ajouter des dĂ©pĂ´ts tiers." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml @@ -3412,11 +3463,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml -#, fuzzy -#| msgid "" -#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users " -#| "will know what key they need to import in order to authenticate the files " -#| "in the archive." msgid "" "<emphasis>Publish the key fingerprint</emphasis>, so that your users will " "know what key they need to import in order to authenticate the files in the " @@ -3426,7 +3472,10 @@ msgid "" msgstr "" "<emphasis>publier l'empreinte de la clĂ©</emphasis>. Ainsi les utilisateurs " "de votre archive connaĂ®tront la clĂ© qu'ils doivent importer pour " -"authentifier les fichiers de l'archive." +"authentifier les fichiers de l'archive. Le mieux est de diffuser sa clĂ© dans " +"son propre paquet de trousseau comme le fait &keyring-distro; avec &keyring-" +"package; pour ensuite distribuer automatiquement les mises Ă jour et les " +"transitions de clĂ©s." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml @@ -3438,6 +3487,13 @@ msgid "" "included in another archive users already have configured (like the default " "repositories of their distribution) to leveraging the web of trust." msgstr "" +"<emphasis>fournir les instructions pour ajouter l'archive et la clĂ©</" +"emphasis>. Si les utilisateurs ne peuvent rĂ©cupĂ©rer de façon sĂ»re votre clĂ©, " +"la chaĂ®ne de confiance dĂ©crite plus haut est rompue. La façon d'aider les " +"utilisateurs Ă ajouter votre clĂ© de l'archive dĂ©pend de l'archive et de " +"l'audience cible : cela va d'un paquet de trousseau inclus dans une autre " +"archive que des utilisateurs ont dĂ©jĂ configurĂ©e (comme les dĂ©pĂ´ts par " +"dĂ©faut de leur distribution) Ă la mobilisation du web de confiance." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml @@ -3446,8 +3502,8 @@ msgid "" "removed) the archive maintainer has to follow the first two steps outlined " "above." msgstr "" -"Chaque fois que le contenu de l'archive change, le responsable doit refaire " -"les deux premières Ă©tapes." +"Chaque fois que le contenu de l'archive change, (suppression ou ajout de " +"nouveaux paquets) le responsable doit refaire les deux premières Ă©tapes." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml @@ -3858,6 +3914,8 @@ msgid "" "all options set in the binary specific configuration subtree are moved into " "the root of the tree." msgstr "" +"toutes les options dĂ©finie dans le sous-arbre binaire de configuration " +"spĂ©cifique sont dĂ©placĂ©es Ă la racine de l'arbre." #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml @@ -4112,7 +4170,7 @@ msgid "" "are registered via <command>dpkg --add-architecture</command>." msgstr "" "Toutes les architectures gĂ©rĂ©es par le système. Par exemple, les processeurs " -"qui mettent en oeuvre le jeu d'instructions <literal>amd64</literal> (aussi " +"qui mettent en Å“uvre le jeu d'instructions <literal>amd64</literal> (aussi " "appelĂ© <literal>x86-64</literal>) peuvent exĂ©cuter des binaires compilĂ©s " "pour le jeu d'instructions<literal>i386</literal> (<literal>x86</literal>). " "Cette liste est utilisĂ© pour rĂ©cupĂ©rer des fichiers et analyser les listes " @@ -4133,6 +4191,15 @@ msgid "" "pass to the command <command>rev</command> without additional commandline " "parameters for compression and uncompression:" msgstr "" +"Ce champ d'action (« scope ») dĂ©finit quels formats de compression sont " +"gĂ©rĂ©s, comment la compression et la dĂ©compression peuvent Ăªtre rĂ©alisĂ©es si " +"ce format n'est pas pris en charge directement dans APT et une indication du " +"coĂ»t d'une compression dans ce format. Dans cet exemple, le paragraphe " +"suivant de la configuration permettra Ă APT de tĂ©lĂ©charger, dĂ©compresser, " +"crĂ©er et stocker des fichiers avec l'extension de fichier Ă bas coĂ»t " +"<literal>.reversed</literal> qu'il passera Ă la commande <command>rev</" +"command> sans paramètre supplĂ©mentaire en ligne de commande pour la " +"compression et la dĂ©compression :" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting> #: apt.conf.5.xml @@ -4147,6 +4214,14 @@ msgid "" "\tCost \"10\";\n" "};\n" msgstr "" +"APT::Compressor::rev {\n" +"\tName \"rev\";\n" +"\tExtension \".reversed\";\n" +"\tBinary \"rev\";\n" +"\tCompressArg {};\n" +"\tUncompressArg {};\n" +"\tCost \"10\";\n" +"};\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -4391,16 +4466,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml -#, fuzzy -#| msgid "" -#| "Security related option defaulting to true, as giving a Release file's " -#| "validation an expiration date prevents replay attacks over a long " -#| "timescale, and can also for example help users to identify mirrors that " -#| "are no longer updated - but the feature depends on the correctness of the " -#| "clock on the user system. Archive maintainers are encouraged to create " -#| "Release files with the <literal>Valid-Until</literal> header, but if they " -#| "don't or a stricter value is desired the <literal>Max-ValidTime</literal> " -#| "option below can be used." msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@ -4419,20 +4484,14 @@ msgstr "" "jour. Cependant, cette fonctionnalitĂ© a besoin que l'horloge du système soit " "Ă jour. Les gestionnaires d'archives devraient crĂ©er des fichiers Release " "comportant l'en-tĂªte <literal>Valid-Until</literal>. Cependant, si cet en-" -"tĂªte est absent, la valeur du paramètre <literal>Max-ValidTime</literal> est " -"alors utilisĂ©e." +"tĂªte est absent, ou si une valeur plus stricte est dĂ©sirĂ©e, la valeur du " +"paramètre <literal>Max-ValidTime</literal> est alors utilisĂ©e. L'option " +"<option>Check-Valid-Until</option> des entrĂ©es de &sources-list; devrait " +"Ăªtre prĂ©fĂ©rĂ©e pour dĂ©sactiver sĂ©lectivement la vĂ©rification plutĂ´t que " +"d'utiliser ce remplacement global." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml -#, fuzzy -#| msgid "" -#| "Maximum time (in seconds) after its creation (as indicated by the " -#| "<literal>Date</literal> header) that the <filename>Release</filename> " -#| "file should be considered valid. If the Release file itself includes a " -#| "<literal>Valid-Until</literal> header the earlier date of the two is used " -#| "as the expiration date. The default value is <literal>0</literal> which " -#| "stands for \"valid forever\". Archive specific settings can be made by " -#| "appending the label of the archive to the option name." msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -4445,24 +4504,18 @@ msgid "" "Until-Max</option> option there." msgstr "" "DurĂ©e maximale (en secondes) pendant laquelle un fichier Release est " -"considĂ©rĂ© comme valable, Ă partir du moment de sa crĂ©ation. Si ce fichier " -"lui-mĂªme comporte un en-tĂªte la plus ancienne des deux dates est utilisĂ©e " -"comme date d'expiration. La valeur par dĂ©faut (<literal>0</literal>) " -"signifie « valable Ă©ternellement ». Un rĂ©glage spĂ©cifique pour une archive " -"donnĂ©e peut Ăªtre dĂ©fini en ajoutant l'Ă©tiquette de l'archive au nom de " -"l'option." +"considĂ©rĂ© comme valable, Ă partir du moment de sa crĂ©ation (tel que cela est " +"indiquĂ© dans l'en-tĂªte <literal>Date</literal>). Si ce fichier lui-mĂªme " +"comporte un en-tĂªte <literal>Valid-Until</literal> la plus ancienne des deux " +"dates est utilisĂ©e comme date d'expiration. La valeur par dĂ©faut " +"(<literal>0</literal>) signifie « valable Ă©ternellement ». Un rĂ©glage " +"spĂ©cifique pour une archive donnĂ©e peut Ăªtre dĂ©fini en ajoutant l'Ă©tiquette " +"de l'archive au nom de l'option. De prĂ©fĂ©rence, le mĂªme rĂ©sultat peut Ăªtre " +"obtenu pour des entrĂ©es particulières de &sources-list; en utilisant ici " +"l'option <option>Valid-Until-Max</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml -#, fuzzy -#| msgid "" -#| "Minimum time (in seconds) after its creation (as indicated by the " -#| "<literal>Date</literal> header) that the <filename>Release</filename> " -#| "file should be considered valid. Use this if you need to use a seldom " -#| "updated (local) mirror of a more frequently updated archive with a " -#| "<literal>Valid-Until</literal> header instead of completely disabling the " -#| "expiration date checking. Archive specific settings can and should be " -#| "used by appending the label of the archive to the option name." msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -4475,21 +4528,19 @@ msgid "" "Until-Min</option> option there." msgstr "" "DurĂ©e minimale (en secondes) pendant laquelle un fichier Release est " -"considĂ©rĂ© comme valable, Ă partir du moment de sa crĂ©ation. Il est conseillĂ© " -"d'utiliser ce rĂ©glage si vous utilisez un miroir mis Ă jour ponctuellement " -"(par exemple un miroir local) d'une archive mise Ă jour plus frĂ©quemment " -"avec un en-tĂªte <literal>Valid-Until</literal> plutĂ´t que de dĂ©sactiver " -"complètement le contrĂ´le des dates d'expiration. Un rĂ©glage spĂ©cifique pour " -"une archive donnĂ©e peut Ăªtre dĂ©fini en ajoutant l'Ă©tiquette de l'archive au " -"nom de l'option." +"considĂ©rĂ© comme valable, Ă partir du moment de sa crĂ©ation (tel que cela est " +"indiquĂ© dans l'en-tĂªte <literal>Date</literal>). Il est conseillĂ© d'utiliser " +"ce rĂ©glage si vous utilisez un miroir mis Ă jour ponctuellement (par exemple " +"un miroir local) d'une archive mise Ă jour plus frĂ©quemment avec un en-tĂªte " +"<literal>Valid-Until</literal> plutĂ´t que de dĂ©sactiver complètement le " +"contrĂ´le des dates d'expiration. Un rĂ©glage spĂ©cifique pour une archive " +"donnĂ©e peut Ăªtre dĂ©fini en ajoutant l'Ă©tiquette de l'archive au nom de " +"l'option. De prĂ©fĂ©rence, le mĂªme rĂ©sultat peut Ăªtre obtenu pour des entrĂ©es " +"particulières de &sources-list; en utilisant ici l'option <option>Valid-" +"Until-Min</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml -#, fuzzy -#| msgid "" -#| "Try to download deltas called <literal>PDiffs</literal> for indexes (like " -#| "<filename>Packages</filename> files) instead of downloading whole ones. " -#| "True by default." msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@ -4498,7 +4549,10 @@ msgid "" msgstr "" "Essayer de tĂ©lĂ©charger les fichiers diffĂ©rentiels appelĂ©s <literal>PDiffs</" "literal> pour les index (par exemple les fichiers <filename>Packages</" -"filename>), plutĂ´t que de les tĂ©lĂ©charger entièrement. Par dĂ©faut à « true »." +"filename>), plutĂ´t que de les tĂ©lĂ©charger entièrement. Par dĂ©faut Ă " +"« true ». De prĂ©fĂ©rence, cela peut Ăªtre dĂ©fini pour des entrĂ©es " +"particulières de &sources-list; ou des fichiers d'index en utilisant ici " +"l'option <option>PDiffs</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -4521,11 +4575,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml -#, fuzzy -#| msgid "" -#| "Try to download deltas called <literal>PDiffs</literal> for indexes (like " -#| "<filename>Packages</filename> files) instead of downloading whole ones. " -#| "True by default." msgid "" "Try to download indexes via an URI constructed from a hashsum of the " "expected file rather than downloaded via a well-known stable filename. True " @@ -4534,9 +4583,14 @@ msgid "" "this can be set for specific &sources-list; entries or index files by using " "the <option>By-Hash</option> option there." msgstr "" -"Essayer de tĂ©lĂ©charger les fichiers diffĂ©rentiels appelĂ©s <literal>PDiffs</" -"literal> pour les index (par exemple les fichiers <filename>Packages</" -"filename>), plutĂ´t que de les tĂ©lĂ©charger entièrement. Par dĂ©faut à « true »." +"Essayer de tĂ©lĂ©charger les index avec un URI construit Ă partir de la somme " +"de hachage du fichier attendu plutĂ´t que de les tĂ©lĂ©charger Ă partir d'un " +"nom de fichier stable bien connu. Par dĂ©faut à « true », mais " +"automatiquement dĂ©sactivĂ© si la source n'indique pas sa prise en charge. Son " +"utilisation peut Ăªtre forcĂ©e avec la valeur spĂ©ciale « force ». De " +"prĂ©fĂ©rence, cela peut Ăªtre dĂ©fini pour des entrĂ©es particulières de &sources-" +"list; ou des fichiers d'index en utilisant ici l'option <option>By-Hash</" +"option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -4572,7 +4626,7 @@ msgid "" msgstr "" "Utilise des liens symboliques pour les archives de sources. PositionnĂ©e Ă " "« true », cette option crĂ©e si possible des liens symboliques vers les " -"archives de sources au lieu de les copier. Par dĂ©faut à « true »." +"archives de sources au lieu de les copier. Par dĂ©faut à « true »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -4586,7 +4640,7 @@ msgid "" "be used." msgstr "" "<literal>http::Proxy</literal> est le mandataire (proxy) HTTP Ă utiliser par " -"dĂ©faut pour les URI HTTP. Il se prĂ©sente sous la forme standard : " +"dĂ©faut pour les URI HTTP. Il se prĂ©sente sous la forme standard : " "<literal>http://[[utilisateur][:mot_de_passe]@]hĂ´te[:port]/</literal>. On " "peut spĂ©cifier un mandataire particulier par hĂ´te distant en utilisant la " "syntaxe : <literal>http::Proxy::<hĂ´te></literal>. Le mot-clĂ© spĂ©cial " @@ -4627,15 +4681,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml -#, fuzzy -#| msgid "" -#| "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used " -#| "to enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be " -#| "beneficial e.g. on high-latency connections. It specifies how many " -#| "requests are sent in a pipeline. Previous APT versions had a default of " -#| "10 for this setting, but the default value is now 0 (= disabled) to avoid " -#| "problems with the ever-growing amount of webservers and proxies which " -#| "choose to not conform to the HTTP/1.1 specification." msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@ -4648,11 +4693,11 @@ msgstr "" "Le rĂ©glage <literal>Acquire::http::Pipeline-Depth</literal> permet " "d'utiliser l'enchaĂ®nement HTTP (« HTTP pipelining », RFC 2616 section " "8.1.2.2) ce qui peut Ăªtre utile par exemple avec des connexions Ă latence " -"Ă©levĂ©e. Il indique le nombre de requĂªtes envoyĂ©es dans le tuyau. Les " -"versions prĂ©cĂ©dentes d'APT utilisaient une valeur de 10 pour ce rĂ©glage. " -"Cette valeur est dĂ©sormais Ă©gale Ă 0 (dĂ©sactivĂ©) pour Ă©viter des problèmes " -"avec le nombre en constante augmentation de serveurs web et de mandataires " -"qui ne respectent pas la norme HTTP/1.1." +"Ă©levĂ©e. Il indique le nombre de requĂªtes envoyĂ©es dans le tuyau. APT tente " +"de dĂ©tecter et de contourner les serveurs web et les mandataires qui se " +"comportent mal Ă l'exĂ©cution, mais si vous savez que vos serveurs ne " +"respectent pas la norme HTTP/1.1, l'enchaĂ®nement peut Ăªtre dĂ©sactivĂ© en " +"dĂ©finissant cette valeur Ă 0. Il est activĂ© par dĂ©faut avec une valeur de 10." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -4693,17 +4738,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml -#, fuzzy -#| msgid "" -#| "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to " -#| "specify an external command to discover the http proxy to use. Apt " -#| "expects the command to output the proxy on stdout in the style " -#| "<literal>http://proxy:port/</literal>. This will override the generic " -#| "<literal>Acquire::http::Proxy</literal> but not any specific host proxy " -#| "configuration set via <literal>Acquire::http::Proxy::$HOST</literal>. " -#| "See the &squid-deb-proxy-client; package for an example implementation " -#| "that uses avahi. This option takes precedence over the legacy option name " -#| "<literal>ProxyAutoDetect</literal>." msgid "" "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify " "an external command to discover the http proxy to use. The first and only " @@ -4720,13 +4754,17 @@ msgid "" msgstr "" "L'option <literal>Acquire::http::Proxy-Auto-Detect</literal> peut Ăªtre " "utilisĂ©e pour indiquer une commande externe pour dĂ©couvrir le mandataire " -"HTTP Ă utiliser. Apt s'attend Ă ce que la commande sorte le mandataire sur " -"la sortie standard dans le style <literal>http://proxy:port/</literal>. Cela " -"annulera le <literal>Acquire::http::Proxy</literal> gĂ©nĂ©rique, mais pas une " -"configuration spĂ©cifique de mandataire hĂ´te Ă©tablie par <literal>Acquire::" -"http::Proxy::$HOST</literal>. Voir le paquet &squid-deb-proxy-client; pour " -"un exemple d'implĂ©mentation qui utilise avahi. Cette option l'emporte sur " -"l'ancien nom d'option <literal>ProxyAutoDetect</literal>." +"HTTP Ă utiliser. Le premier et seul paramètre est un URI indiquant l'hĂ´te Ă " +"contacter pour permettre une configuration propre Ă l'hĂ´te. Apt s'attend Ă " +"ce que la commande indique le mandataire sur la sortie standard dans le " +"style <literal>http://proxy:port/</literal> ou le mot <literal>DIRECT</" +"literal> si aucun mandataire ne doit Ăªtre utilisĂ©. Aucune sortie indique que " +"le mandataire gĂ©nĂ©rique doit Ăªtre utilisĂ©. Notez que l'auto-dĂ©tection ne " +"sera pas exĂ©cutĂ©e si une configuration spĂ©cifique de mandataire hĂ´te a dĂ©jĂ " +"Ă©tĂ© Ă©tablie par <literal>Acquire::http::Proxy::$HOST</literal>. Voir le " +"paquet &squid-deb-proxy-client; pour un exemple d'implĂ©mentation qui utilise " +"avahi. Cette option l'emporte sur l'ancien nom d'option " +"<literal>ProxyAutoDetect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -4773,7 +4811,7 @@ msgstr "" "boolĂ©enne <literal>Verify-Host</literal> prĂ©cise s'il faut vĂ©rifier ou pas " "le nom d'hĂ´te du serveur. <literal>SslCert</literal> dĂ©termine le certificat " "Ă utiliser pour l'authentification du client. <literal>SslKey</literal> " -"dĂ©termine quelle clef privĂ©e doit Ăªtre utilisĂ©e pour l'authentification du " +"dĂ©termine quelle clĂ© privĂ©e doit Ăªtre utilisĂ©e pour l'authentification du " "client. <literal>SslForceVersion</literal> surcharge la valeur par dĂ©faut " "pour la version de SSL Ă utiliser et peut contenir l'une des chaĂ®nes " "<literal>TLSv1</literal> ou <literal>SSLv3</literal>." @@ -4908,15 +4946,6 @@ msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml -#, fuzzy -#| msgid "" -#| "List of compression types which are understood by the acquire methods. " -#| "Files like <filename>Packages</filename> can be available in various " -#| "compression formats. By default the acquire methods can decompress " -#| "<command>bzip2</command>, <command>lzma</command> and <command>gzip</" -#| "command> compressed files; with this setting more formats can be added on " -#| "the fly or the used method can be changed. The syntax for this is: " -#| "<placeholder type=\"synopsis\" id=\"0\"/>" msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4929,11 +4958,13 @@ msgstr "" "Cette option indique la liste des types de compression comprises par les " "mĂ©thodes d'acquisition. Des fichiers comme <filename>Packages</filename> " "peuvent Ăªtre disponibles dans divers formats de compression. Par dĂ©faut, les " -"mĂ©thodes d'acquisition dĂ©compressent les fichiers compressĂ©s avec " -"<command>bzip2</command>, <command>lzma</command> et <command>gzip</" -"command>. Ce rĂ©glage permet d'ajouter Ă la volĂ©e des formats supplĂ©mentaires " -"ou de modifier la mĂ©thode utilisĂ©e. La syntaxe Ă utiliser est : <placeholder " -"type=\"synopsis\" id=\"0\"/>" +"mĂ©thodes d'acquisition dĂ©compressent et recompressent dans beaucoup de " +"formats courants les fichiers compressĂ©s comme avec <command>xz</command> et " +"<command>gzip</command> ; ce champ d'action permet de rechercher les formats " +"pris en charge ou de les modifier, et l'ajout de prise en charge de formats " +"supplĂ©mentaires est aussi possible (voir aussi <option>APT::Compressor</" +"option>). La syntaxe Ă utiliser est : <placeholder type=\"synopsis\" id=" +"\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> #: apt.conf.5.xml @@ -4949,21 +4980,6 @@ msgstr "Acquire::CompressionTypes::Order { \"xz\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml -#, fuzzy -#| msgid "" -#| "Also, the <literal>Order</literal> subgroup can be used to define in " -#| "which order the acquire system will try to download the compressed files. " -#| "The acquire system will try the first and proceed with the next " -#| "compression type in this list on error, so to prefer one over the other " -#| "type simply add the preferred type first - default types not already " -#| "added will be implicitly appended to the end of the list, so e.g. " -#| "<placeholder type=\"synopsis\" id=\"0\"/> can be used to prefer " -#| "<command>gzip</command> compressed files over <command>bzip2</command> " -#| "and <command>lzma</command>. If <command>lzma</command> should be " -#| "preferred over <command>gzip</command> and <command>bzip2</command> the " -#| "configure setting should look like this: <placeholder type=\"synopsis\" " -#| "id=\"1\"/> It is not needed to add <literal>bz2</literal> to the list " -#| "explicitly as it will be added automatically." msgid "" "Also, the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4983,15 +4999,15 @@ msgstr "" "les fichiers compressĂ©s. Le premier système mentionnĂ© sera essayĂ© en " "premier, puis le suivant en cas d'Ă©chec. Ainsi, pour privilĂ©gier un format " "par rapport Ă un autre, il suffit de le placer en premier dans cette liste. " -"Les types par dĂ©faut qui ne sont pas dĂ©jĂ indiquĂ©s seront ajoutĂ©s " -"implicitement au moment de l'exĂ©cution. Ainsi, par exemple, <placeholder " -"type=\"synopsis\" id=\"0\"/> peut Ăªtre utiliser de prĂ©fĂ©rence les fichiers " -"compressĂ©s avec <command>gzip</command> par rapport Ă <command>bzip2</" -"command> et <command>lzma</command>. Si l'objectif est d'utiliser " -"<command>lzma</command> en prioritĂ© par rapport Ă <command>gzip</command> et " -"<command>bzip2</command>, ce rĂ©glage doit ressembler Ă <placeholder type=" -"\"synopsis\" id=\"1\"/>. Il est inutile d'ajouter explicitement " -"<literal>bz2</literal> Ă liste car il sera ajoutĂ© automatiquement." +"Les types qui ne sont pas dĂ©jĂ indiquĂ©s seront ajoutĂ©s implicitement Ă la " +"fin de la liste. Ainsi, par exemple, <placeholder type=\"synopsis\" id=\"0\"/" +"> peut Ăªtre utilisĂ© pour prĂ©fĂ©rer les fichiers compressĂ©s avec " +"<command>gzip</command> par rapport Ă tous les autres formats de " +"compression. Si l'objectif est d'utiliser <command>xz</command> en prioritĂ© " +"par rapport Ă <command>gzip</command> et <command>bzip2</command>, ce " +"rĂ©glage doit ressembler Ă <placeholder type=\"synopsis\" id=\"1\"/>. Il est " +"inutile d'ajouter explicitement <literal>bz2</literal> Ă liste car il sera " +"ajoutĂ© automatiquement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> #: apt.conf.5.xml @@ -5001,18 +5017,6 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml -#, fuzzy -#| msgid "" -#| "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" -#| "literal> will be checked at run time. If this option has been set, the " -#| "method will only be used if this file exists; e.g. for the " -#| "<literal>bzip2</literal> method (the inbuilt) setting is: <placeholder " -#| "type=\"literallayout\" id=\"0\"/> Note also that list entries specified " -#| "on the command line will be added at the end of the list specified in the " -#| "configuration files, but before the default entries. To prefer a type in " -#| "this case over the ones specified in the configuration files you can set " -#| "the option direct - not in list style. This will not override the " -#| "defined list; it will only prefix the list with this type." msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set and " @@ -5026,12 +5030,13 @@ msgid "" "This will not override the defined list; it will only prefix the list with " "this type." msgstr "" -"Veuillez noter que <literal>Dir::Bin::<replaceable>Methodname</replaceable></" -"literal> sera contrĂ´lĂ©Â : si cette option est utilisĂ©e, la mĂ©thode ne sera " -"utilisĂ©e que si ce fichier existe. Ainsi, pour la mĂ©thode <literal>bzip2</" -"literal>, le rĂ©glage (utilisĂ© en interne) est <placeholder type=" -"\"literallayout\" id=\"0\"/>. Veuillez Ă©galement noter que les Ă©lĂ©ments de " -"liste indiquĂ©s Ă la ligne de commande seront ajoutĂ©s Ă la fin de la liste " +"Veuillez noter que <literal>Dir::Bin::<replaceable>NomMethode</replaceable></" +"literal> sera contrĂ´lĂ© Ă l'exĂ©cution : si cette option est utilisĂ©e et que " +"la prise en charge de ce format n'est pas construite dans APT, la mĂ©thode ne " +"sera utilisĂ©e que si ce fichier existe. Ainsi, pour la mĂ©thode " +"<literal>bzip2</literal>, le rĂ©glage (utilisĂ© en interne) est <placeholder " +"type=\"literallayout\" id=\"0\"/>. Veuillez Ă©galement noter que les Ă©lĂ©ments " +"de liste indiquĂ©s Ă la ligne de commande seront ajoutĂ©s Ă la fin de la liste " "indiquĂ©e dans les fichiers de configuration, mais avant les valeurs par " "dĂ©faut. Dans ce cas, pour Ă©tablir une prĂ©fĂ©rence par rapport aux types " "mentionnĂ©s dans les fichiers de configuration, il est possible de placer " @@ -5162,6 +5167,8 @@ msgid "" "The maximum file size of Release/Release.gpg/InRelease files. The default " "is 10MB." msgstr "" +"La taille maximale des fichiers Release/Release.gpg/InRelease. La taille par " +"dĂ©faut est 10 Mo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -5170,6 +5177,9 @@ msgid "" "in RFC 2782 to select an alternative server to connect to. The default is " "\"true\"." msgstr "" +"Cette option vĂ©rifie si APT utilisera l'entrĂ©e de serveur DNS SRV telle que " +"dĂ©finie dans la RFC 2782 pour choisir un serveur alternatif auquel se " +"connecter. La valeur par dĂ©faut est « true »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -5179,6 +5189,10 @@ msgid "" "literal>\". Concept, implications as well as alternatives are detailed in " "&apt-secure;." msgstr "" +"Autoriser les opĂ©rations de mise Ă jour Ă charger des fichiers de donnĂ©es Ă " +"partir de dĂ©pĂ´ts sans informations de sĂ©curitĂ© suffisantes. La valeur par " +"dĂ©faut est « <literal>false</literal> ». Le concept, les implications ainsi " +"que les alternatives sont dĂ©taillĂ©s dans &apt-secure;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -5188,6 +5202,12 @@ msgid "" "strong enough. The default value is \"<literal>false</literal>\". Concept, " "implications as well as alternatives are detailed in &apt-secure;." msgstr "" +"Autoriser les opĂ©rations de mise Ă jour Ă charger des fichiers de donnĂ©es Ă " +"partir de dĂ©pĂ´ts qui fournissent des informations de sĂ©curitĂ©, mais qui ne " +"sont plus considĂ©rĂ©s comme suffisamment robustes sur le plan de la " +"cryptographie. La valeur par dĂ©faut est « <literal>false</literal> ». Le " +"concept, les implications ainsi que les alternatives sont dĂ©taillĂ©s dans " +"&apt-secure;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -5199,11 +5219,18 @@ msgid "" "this. The default is <literal>false</literal>. Concept, implications as " "well as alternatives are detailed in &apt-secure;." msgstr "" +"Permettre qu'un dĂ©pĂ´t qui Ă©tait auparavant signĂ© par pgp devienne non signĂ© " +"durant l'opĂ©ration de la mise Ă jour. Quand il n'y a pas de signature " +"valable pour un ancien dĂ©pĂ´t de confiance, APT refusera la mise Ă jour. " +"Cette option peut Ăªtre utilisĂ©e pour contourner cette protection. Vous ne " +"souhaiterez presque certainement jamais activer cette option. La valeur pas " +"dĂ©faut est « <literal>false</literal> ». Le concept, les implications ainsi " +"que les alternatives sont dĂ©taillĂ©s dans &apt-secure;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml msgid "scope" -msgstr "" +msgstr "champ d'action" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -5232,13 +5259,36 @@ msgid "" "used to acquire changelog files from. Another source will be tried if " "available in this case." msgstr "" +"La rĂ©cupĂ©ration des journaux des modifications n'est possible que si l'URI " +"oĂ¹ les tĂ©lĂ©charger est connu. De prĂ©fĂ©rence, le fichier Release l'indique " +"dans un champ « Changelogs ». S'il n'est pas disponible, les champs Label ou " +"Origine du fichier Release sont utilisĂ©s pour vĂ©rifier si les options " +"<literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</replaceable></" +"literal> ou <literal>Acquire::Changelogs::URI::Origin::<replaceable>ORIGINE</" +"replaceable></literal> existent, et si c'est le cas, cette valeur est prise. " +"La valeur dans le fichier Release peut Ăªtre contournĂ©e par <literal>Acquire::" +"Changelogs::URI::Override::Label::<replaceable>LABEL</replaceable></literal> " +"ou <literal>Acquire::Changelogs::URI::Override::Origin::" +"<replaceable>ORIGINE</replaceable></literal>. La valeur devrait Ăªtre un URI " +"normal vers un fichier texte, Ă l'exception que les donnĂ©es spĂ©cifiques du " +"paquet sont remplacĂ©es par le paramètre <literal>@CHANGEPATH@</literal>. Sa " +"valeur est la suivante : 1. si le paquet provient d'un composant (par " +"exemple <literal>main</literal>) il constitue la première partie, sinon elle " +"est omise ; 2. est la première lettre du nom du paquet source, sauf si le " +"nom du paquet source commence par <literal>lib</literal> auquel cas les " +"quatre premières lettres seront utilisĂ©es ; 3. le nom complet du paquet " +"source ; 4. le nom complet une fois de plus ; 5. la version de la source. " +"Les quatres premières parties (ou trois si le composant est absent) sont " +"sĂ©parĂ©es par des barres obliques (« <literal>/</literal> »), et les deux " +"dernières sont sĂ©parĂ©es par un caractère de soulignement (« <literal>_</" +"literal> »). La valeur spĂ©ciale « <literal>no</literal> » est disponible " +"pour indiquer que cette source ne peut Ăªtre utilisĂ©e pour rĂ©cupĂ©rer les " +"fichiers changelog. Dans ce cas, une autre source sera essayĂ©e." #. type: Content of: <refentry><refsect1><title> #: apt.conf.5.xml -#, fuzzy -#| msgid "User configuration" msgid "Binary specific configuration" -msgstr "Configuration utilisateur" +msgstr "Configuration spĂ©cifique d'exĂ©cutable" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml @@ -5249,6 +5299,12 @@ msgid "" "Get::Show-Versions</option> effect <command>apt-get</command> as well as " "<command>apt</command>." msgstr "" +"Particulièrement avec l'introduction de l'exĂ©cutable <command>apt</command> " +"il peut Ăªtre utile de configurer certaines options seulement pour un " +"exĂ©cutable particulier dans la mesure ou mĂªme des options qui semblent " +"affecter seulement certains binaires telles que <option>APT::Get::Show-" +"Versions</option> affectent <command>apt-get</command> autant " +"qu'<command>apt</command>." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml @@ -5259,6 +5315,12 @@ msgid "" "Versions</option> for the <command>apt</command> only can e.g. by done by " "setting <option>Binary::apt::APT::Get::Show-Versions</option> instead." msgstr "" +"La configuration d'une option pour un exĂ©cutable particulier peut Ăªtre " +"rĂ©alisĂ©e en rĂ©glant l'option dans le champ d'action <option>Binary::" +"<replaceable>exĂ©cutable-spĂ©cifique</replaceable></option>. Affecter l'option " +"<option>APT::Get::Show-Versions</option> Ă <command>apt</command> seulement " +"peut Ăªtre fait, par exemple en configurant plutĂ´t <option>Binary::apt::APT::" +"Get::Show-Versions</option>." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml @@ -5267,6 +5329,10 @@ msgid "" "binary-specific options on the commandline itself nor in configuration files " "loaded via the commandline." msgstr "" +"Veuillez noter que comme cela est indiquĂ© dans la section DESCRIPTION plus " +"haut, il n'est pas possible de configurer les options spĂ©cifiques aux " +"exĂ©cutables en ligne de commande ni dans des fichiers de configuration " +"chargĂ©s par la ligne de commande." #. type: Content of: <refentry><refsect1><title> #: apt.conf.5.xml @@ -5364,16 +5430,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml -#, fuzzy -#| msgid "" -#| "The configuration item <literal>RootDir</literal> has a special meaning. " -#| "If set, all paths in <literal>Dir::</literal> will be relative to " -#| "<literal>RootDir</literal>, <emphasis>even paths that are specified " -#| "absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> " -#| "is set to <filename>/tmp/staging</filename> and <literal>Dir::State::" -#| "status</literal> is set to <filename>/var/lib/dpkg/status</filename>, " -#| "then the status file will be looked up in <filename>/tmp/staging/var/lib/" -#| "dpkg/status</filename>." msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths will be relative to <literal>RootDir</literal>, " @@ -5385,14 +5441,15 @@ msgid "" "prefix only relative paths, set <literal>Dir</literal> instead." msgstr "" "L'option de configuration <literal>RootDir</literal> a une signification " -"particulière. Lorsqu'elle est dĂ©finie, tous les chemins dĂ©clarĂ©s dans " -"<literal>Dir::</literal> sont considĂ©rĂ©s relativement Ă <literal>RootDir</" -"literal>, <emphasis>mĂªme les chemins spĂ©cifiĂ©s de manière absolue</" -"emphasis>. Ainsi par exemple si <literal>RootDir</literal> est dĂ©fini comme " -"<filename>/tmp/staging</filename>, et que chemin du fichier d'Ă©tat " -"<literal>Dir::State::status</literal> est dĂ©clarĂ© comme <filename>/var/lib/" -"dpkg/status</filename> alors ce fichier sera cherchĂ© dans <filename>/tmp/" -"staging/var/lib/dpkg/status</filename>." +"particulière. Lorsqu'elle est dĂ©finie, tous les chemins sont considĂ©rĂ©s " +"relativement Ă <literal>RootDir</literal>, <emphasis>mĂªme les chemins " +"spĂ©cifiĂ©s de manière absolue</emphasis>. Ainsi par exemple si " +"<literal>RootDir</literal> est dĂ©fini comme <filename>/tmp/staging</" +"filename>, et que chemin du fichier d'Ă©tat <literal>Dir::State::status</" +"literal> est dĂ©clarĂ© comme <filename>/var/lib/dpkg/status</filename> alors " +"ce fichier sera cherchĂ© dans <filename>/tmp/staging/var/lib/dpkg/status</" +"filename>. Si vous souhaitez seulement prĂ©fixer des chemins relatifs, " +"dĂ©finissez plutĂ´t <literal>Dir</literal>." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml @@ -5543,6 +5600,10 @@ msgid "" "configuration space, and a list of package actions with filename and version " "information." msgstr "" +"La version 2 de ce protocole envoie plus d'informations Ă travers le " +"descripteur du fichier requis : une ligne avec le texte <literal>VERSION 2</" +"literal>, l'espace de configuration d'APT et une liste d'actions de paquet " +"avec le nom de fichier et l'information de version." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -5555,6 +5616,13 @@ msgid "" "=value</literal> lines with the same key. The configuration section ends " "with a blank line." msgstr "" +"Chaque ligne de directive de configuration a la forme <literal>clĂ©=valeur</" +"literal>. Les caractères spĂ©ciaux (signes Ă©gal, fin de ligne, caractères non " +"imprimables, guillemets et signe pourcentage dans <literal>clĂ©</literal> et " +"fin de ligne, caractères non imprimables et signe pourcentage dans " +"<literal>valeur</literal>) sont %-encodĂ©s (encodage URL). Les listes sont " +"reprĂ©sentĂ©s par des lignes <literal>clĂ©::=valeur</literal> multiples avec la " +"mĂªme clĂ©. Les sections de la configuration se terminent par une ligne vide." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -5569,6 +5637,18 @@ msgid "" "the package is being configured, \"**REMOVE**\" if it is being removed, or " "the filename of a .deb file if it is being unpacked." msgstr "" +"Les lignes d'action de paquet consistent en cinq champs dans la version 2 : " +"le nom du paquet (sans qualification d'architecture, mĂªme si c'est une " +"architecture supplĂ©mentaire – « foreign »), la version ancienne, la " +"direction du changement de version (< pour les mises Ă niveau, > pour " +"les retours en arrière, = pour pas de modification), la nouvelle version, " +"l'action. Les champs versions sont « - » pour pas de version du tout (par " +"exemple lors de la première installation d'un paquet ; pas de version est " +"traitĂ© comme antĂ©rieur Ă n'importe quelle version rĂ©elle, ainsi c'est une " +"mise Ă jour, indiquĂ©e comme <literal>- < 1.23.4</literal>). Le champ " +"action est « **CONFIGURE** » si le paquet est en cours de configuration, " +"« **REMOVE** » s'il est en cours de suppression, ou bien le nom d'un " +"fichier .deb s'il est en cours de dĂ©paquetage." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -5579,6 +5659,12 @@ msgid "" "\"none\" is an incorrect typename which is just kept to remain compatible, " "it should be read as \"no\" and users are encouraged to support both." msgstr "" +"Dans la Version 3, après chaque champ version, se trouve l’architecture de " +"cette version qui est « - » s'il n'y a pas de version, puis un champ " +"montrant le type MultiArch « same », « foreign », « allowed » ou « none ». " +"Veuillez noter que « none » est un nom de type incorrect qui est juste " +"conservĂ© pour des raisons de compatibilitĂ©, il devrait Ăªtre lu comme « no » " +"et les utilisateurs sont encouragĂ©s Ă prendre en charge les deux." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml @@ -5636,14 +5722,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml -#, fuzzy -#| msgid "" -#| "If this option is set APT will call <command>dpkg --configure --pending</" -#| "command> to let &dpkg; handle all required configurations and triggers. " -#| "This option is activated automatically per default if the previous option " -#| "is not set to <literal>all</literal>, but deactivating it could be useful " -#| "if you want to run APT multiple times in a row - e.g. in an installer. In " -#| "these sceneries you could deactivate this option in all but the last run." msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@ -5653,9 +5731,8 @@ msgid "" msgstr "" "Si cette option est choisie, APT lancera <command>dpkg --configure --" "pending</command> pour laisser &dpkg; gĂ©rer les configurations de paquets et " -"les actions diffĂ©rĂ©es. Cette option est automatiquement activĂ©e si l'option " -"prĂ©cĂ©dente a une valeur diffĂ©rente de « <literal>all</literal> ». Il peut " -"par contre Ăªtre utile de la dĂ©sactiver pour lancer APT plusieurs fois " +"les actions diffĂ©rĂ©es. Cette option est automatiquement activĂ©e. Il peut par " +"contre Ăªtre utile de la dĂ©sactiver pour lancer APT plusieurs fois " "successives, par exemple quand il est utilisĂ© depuis un outil " "d'installation. Dans ce cas, seul le dernier de tous les appels successifs " "peut conserver l'option active." @@ -5695,7 +5772,7 @@ msgid "" msgstr "" "Les options de la section <literal>Debug::</literal> servent soit Ă " "provoquer l'affichage d'informations de dĂ©bogage sur la sortie d'erreur " -"standard du programme qui utilise les librairies APT, soit Ă activer des " +"standard du programme qui utilise les bibliothèques APT, soit Ă activer des " "modes de fonctionnement spĂ©ciaux qui sont principalement utiles pour " "dĂ©boguer le comportement de <literal>APT</literal>. La plupart de ces " "options n'ont pas d'intĂ©rĂªt pour un utilisateur normal, mais certaines " @@ -5806,7 +5883,7 @@ msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" -"Affiche toutes les clefs de hachage cryptographiques crĂ©Ă©es par les " +"Affiche toutes les clĂ©s de hachage cryptographiques crĂ©Ă©es par les " "librairies d'<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -6227,13 +6304,10 @@ msgstr "une prioritĂ© Ă©gale Ă 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml -#, fuzzy -#| msgid "" -#| "to the versions that are not installed and belong to the target release." msgid "to the versions that do not belong to the target release." msgstr "" -"est affectĂ©e aux versions qui ne sont pas installĂ©es et qui appartiennent Ă " -"la distribution par dĂ©faut." +"est affectĂ©e aux versions qui n'appartiennent pas Ă la distribution par " +"dĂ©faut." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml @@ -6242,13 +6316,9 @@ msgstr "une prioritĂ© Ă©gale Ă 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml -#, fuzzy -#| msgid "" -#| "to the versions that are not installed and belong to the target release." msgid "to the versions that belong to the target release." msgstr "" -"est affectĂ©e aux versions qui ne sont pas installĂ©es et qui appartiennent Ă " -"la distribution par dĂ©faut." +"est affectĂ©e aux versions qui appartiennent Ă la distribution par dĂ©faut." #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml @@ -6256,6 +6326,8 @@ msgid "" "The highest of those priorities whose description matches the version is " "assigned to the version." msgstr "" +"La prioritĂ© la plus Ă©levĂ©e dont la description correspond Ă la version est " +"affectĂ©e Ă la version." #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml @@ -6527,7 +6599,7 @@ msgid "" "belonging to any distribution whose Codename is \"<literal>&debian-testing-" "codename;</literal>\"." msgstr "" -"L'entrĂ©e suivante affecte une prioritĂ© basse Ă toutes les versions d'un " +"L'entrĂ©e suivante affecte une prioritĂ© haute Ă toutes les versions d'un " "paquet appartenant Ă toute distribution dont le nom de code est " "<literal>&debian-testing-codename;</literal>." @@ -6576,6 +6648,10 @@ msgid "" "For any type of condition (such as two \"a\" conditions), only the last such " "condition is checked." msgstr "" +"L'effet de l'opĂ©rateur virgule est identique Ă un « and » logique : toutes " +"les conditions doivent Ăªtre satisfaites pour que l'Ă©pinglage corresponde. Il " +"existe une exception : pour chaque type de condition (telles que deux " +"conditions « a »), seule la dernière condition est vĂ©rifiĂ©e." #. type: Content of: <refentry><refsect1><refsect2><title> #: apt_preferences.5.xml @@ -6749,22 +6825,15 @@ msgstr "cette prioritĂ© empĂªche l'installation de la version." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml msgid "P = 0" -msgstr "" +msgstr "P = 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml msgid "has undefined behaviour, do not use it." -msgstr "" +msgstr "a un comportement indĂ©fini, ne pas l'utiliser." #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml -#, fuzzy -#| msgid "" -#| "If any specific-form records match an available package version then the " -#| "first such record determines the priority of the package version. " -#| "Failing that, if any general-form records match an available package " -#| "version then the first such record determines the priority of the package " -#| "version." msgid "" "The first specific-form record matching an available package version " "determines the priority of the package version. Failing that, the priority " @@ -6772,11 +6841,12 @@ msgid "" "generic-form records matching the version. Records defined using patterns " "in the Pin field other than \"*\" are treated like specific-form records." msgstr "" -"Si l'une des entrĂ©es de forme particulière correspond Ă la version " -"disponible d'un paquet, la première entrĂ©e trouvĂ©e dĂ©termine la prioritĂ© de " -"cette version. S'il n'en existe pas, et si l'une des entrĂ©es de forme " -"gĂ©nĂ©rale correspond Ă la version disponible d'un paquet, la première entrĂ©e " -"trouvĂ©e dĂ©termine la prioritĂ©." +"La première entrĂ©e de forme particulière correspondant Ă une version " +"disponible de paquet dĂ©termine la prioritĂ© de la version du paquet. S'il " +"n'en existe pas, la prioritĂ© du paquet est dĂ©finie comme la plus haute de " +"toutes les prioritĂ©s par les entrĂ©es de forme gĂ©nĂ©rale correspondant Ă la " +"version. Les entrĂ©es dĂ©finies en utilisant des motifs dans le champ Pin " +"autre que « * » sont traitĂ©es comme des entrĂ©es de forme gĂ©nĂ©rale." #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml @@ -7430,14 +7500,6 @@ msgstr "Liste des sources de donnĂ©es APT configurĂ©es" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml -#, fuzzy -#| msgid "" -#| "The source list <filename>/etc/apt/sources.list</filename> is designed to " -#| "support any number of active sources and a variety of source media. The " -#| "file lists one source per line, with the most preferred source listed " -#| "first. The information available from the configured sources is acquired " -#| "by <command>apt-get update</command> (or by an equivalent command from " -#| "another APT front-end)." msgid "" "The source list <filename>/etc/apt/sources.list</filename> and the files " "contained in <filename>/etc/apt/sources.list.d/</filename> are designed to " @@ -7449,12 +7511,16 @@ msgid "" "is acquired by <command>apt-get update</command> (or by an equivalent " "command from another APT front-end)." msgstr "" -"Le fichier de liste de sources <filename>/etc/apt/sources.list</filename> " -"est prĂ©vu pour pouvoir gĂ©rer un nombre quelconque de sources actives et de " -"supports. Le fichier donne une source par ligne, avec les sources " -"prioritaires en premier. L'information relative aux sources configurĂ©es est " -"rĂ©cupĂ©rĂ©e par la commande <command>apt-get update</command> (ou par une " -"commande Ă©quivalent avec une autre interface Ă APT)." +"Le fichier de liste de sources <filename>/etc/apt/sources.list</filename> et " +"les fichiers contenus dans <filename>/etc/apt/sources.list.d/</filename> " +"sont conçus pour pouvoir gĂ©rer un nombre quelconque de sources actives et de " +"mĂ©dias. Le fichier donne une source par ligne (One-Line style) ou fournit " +"des paragraphes multilignes dĂ©finissant une ou plusieurs sources par " +"paragraphe (style deb822), avec les sources prioritaires en premier (dans le " +"cas oĂ¹ il y a une seule version disponible Ă partir de plus d'une source). " +"L'information relative aux sources configurĂ©es est rĂ©cupĂ©rĂ©e par la commande " +"<command>apt-get update</command> (ou par une commande Ă©quivalente avec une " +"autre interface Ă APT)." #. type: Content of: <refentry><refsect1><title> #: sources.list.5.xml @@ -7463,17 +7529,6 @@ msgstr "sources.list.d" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml -#, fuzzy -#| msgid "" -#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way " -#| "to add sources.list entries in separate files. The format is the same as " -#| "for the regular <filename>sources.list</filename> file. File names need " -#| "to end with <filename>.list</filename> and may only contain letters (a-z " -#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) " -#| "characters. Otherwise APT will print a notice that it has ignored a " -#| "file, unless that file matches a pattern in the <literal>Dir::Ignore-" -#| "Files-Silently</literal> configuration list - in which case it will be " -#| "silently ignored." msgid "" "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to " "add sources.list entries in separate files. Two different file formats are " @@ -7487,21 +7542,21 @@ msgid "" "ignored." msgstr "" "Le rĂ©pertoire <filename>/etc/apt/sources.list.d</filename> permet de " -"spĂ©cifier des sources de paquets dans des fichiers distincts qui se " -"terminent par <literal>.list</literal>. Leur format est le mĂªme que celui du " -"fichier <filename>sources.list</filename>. Les noms de fichiers doivent se " -"terminer par <filename>.list</filename> et ne peuvent contenir que des " -"lettres (a-z et A-Z), des chiffres (0-9), des caractères de soulignement " -"(_), des tirets et des points. Dans le cas contraire, APT affichera un " -"avertissement indiquant qu'il a ignorĂ© un fichier si celui-ci ne correspond " -"par Ă un motif dĂ©fini dans <literal>Dir::Ignore-Files-Silently</literal> " -"(les fichiers correspondant Ă cette variable de configuration Ă©tant, eux, " -"ignorĂ©s silencieusemennt)." +"spĂ©cifier des sources de paquets dans des fichiers distincts. Deux formats " +"de fichiers diffĂ©rents sont permis comme cela est dĂ©crit dans les deux " +"sections suivantes. Les noms de fichier doivent se terminer par <filename>." +"list</filename> ou par <filename>.sources</filename> selon le format fourni. " +"Ils ne peuvent contenir que des lettres (a-z et A-Z), des chiffres (0-9), " +"des caractères de soulignement (_), des tirets (-) et des points (.). Dans " +"le cas contraire, APT affichera un avertissement indiquant qu'il a ignorĂ© un " +"fichier si celui-ci ne correspond par Ă un motif dĂ©fini dans <literal>Dir::" +"Ignore-Files-Silently</literal> (les fichiers correspondant Ă cette variable " +"de configuration Ă©tant, eux, ignorĂ©s silencieusement)." #. type: Content of: <refentry><refsect1><title> #: sources.list.5.xml msgid "One-Line-Style Format" -msgstr "" +msgstr "Format One-Line-Style" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -7522,6 +7577,20 @@ msgid "" "as separators, which instead of replacing the default with the given " "value(s) modify the default value(s) to remove or include the given values." msgstr "" +"Les entrĂ©es individuelles ne peuvent pas se poursuivre sur la ligne " +"suivante. Les lignes vides sont ignorĂ©es et un caractère <literal>#</" +"literal> n'importe oĂ¹ sur une ligne signale que le reste de la ligne est un " +"commentaire. Par consĂ©quent, une entrĂ©e peut Ăªtre dĂ©sactivĂ©e en commentant " +"la totalitĂ© de la ligne. Si plusieurs options doivent Ăªtre fournies, elles " +"sont sĂ©parĂ©es par des espaces et sont entourĂ©es toutes ensembles par des " +"crochets (<literal>[]</literal>) inclus sur la ligne après le type sĂ©parĂ© " +"par un espace. Si une option permet plusieurs valeurs, elles sont sĂ©parĂ©es " +"les unes des autres par une virgule (<literal>,</literal>). Un nom d'option " +"est sĂ©parĂ© de ses options par une signe Ă©gal (<literal>=</literal>). Des " +"options Ă plusieurs valeurs disposent aussi des sĂ©parateurs <literal>-=</" +"literal> et <literal>+=</literal>, qui, au lieu de remplacer la valeur par " +"dĂ©faut par la ou les valeurs donnĂ©es, modifient la ou les valeurs par dĂ©faut " +"pour supprimer ou inclure les valeurs donnĂ©es." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -7532,11 +7601,17 @@ msgid "" "expect to encounter options as they were uncommon before the introduction of " "multi-architecture support." msgstr "" +"Il s'agit du format traditionnel, gĂ©rĂ© par toute les version de APT. " +"Veuillez noter que toutes les options dĂ©crites plus bas ne sont pas prises " +"en charge par toutes les versions d'APT. Notez aussi que certaine des plus " +"anciennes applications qui analysent ce format elles-mĂªmes ne s'attendent " +"pas Ă rencontrer des options qui Ă©taient rares avant l'introduction de la " +"prise en charge multi-architecture." #. type: Content of: <refentry><refsect1><title> #: sources.list.5.xml msgid "deb822-Style Format" -msgstr "" +msgstr "Format deb822-Style" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -7558,6 +7633,26 @@ msgid "" "also have <literal>Architectures-Add</literal> and <literal>Architectures-" "Remove</literal> to modify the default value rather than replacing it." msgstr "" +"Les fichiers dans ce format possèdent l'extension <filename>.sources</" +"filename>. La syntaxe du format est similaire Ă celle des autres fichiers " +"utilisĂ©s par Debian et ses dĂ©rivĂ©s, comme les fichiers de mĂ©tadonnĂ©es qu'APT " +"tĂ©lĂ©charge des sources configurĂ©es ou le fichier <filename>debian/control</" +"filename> d'un paquet source de Debian. Les entrĂ©es individuelles sont " +"sĂ©parĂ©es par une ligne vide ; les lignes vides supplĂ©mentaires sont ignorĂ©es " +"et un caractère <literal>#</literal> en dĂ©but de ligne signale la ligne " +"comme un commentaire. Une entrĂ©e, par consĂ©quent, peut Ăªtre dĂ©sactivĂ©e en " +"commentant chaque ligne appartenant au paragraphe, mais il est " +"habituellement plus facile d'ajouter le champ « Enabled: no » au paragraphe " +"pour dĂ©sactiver l'entrĂ©e. Retirer ce champ ou le dĂ©finir à « yes » le " +"rĂ©active. Les options ont la mĂªme syntaxe que tous les autres champs : un " +"nom de champ sĂ©parĂ© par le caracère deux-points (<literal>:</literal>) et " +"Ă©ventuellement des valeurs sĂ©parĂ©es par des espaces. Veuillez noter " +"particulièrement que des valeurs multiples sont sĂ©parĂ©es par des espaces et " +"non par des virgules comme dans le format « One-Line ». Les champs " +"multivaleurs comme <literal>Architectures</literal> disposent aussi des " +"options <literal>Architectures-Add</literal> et <literal>Architectures-" +"Remove</literal> pour modifier la valeur par dĂ©faut plutĂ´t que de la " +"remplacer." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -7573,28 +7668,26 @@ msgid "" "adopt this format already, but may encounter problems with software not " "supporting the format yet." msgstr "" +"Il s'agit d'un nouveau format pris en charge par APT lui-mĂªme depuis la " +"version 1.1. Les versions prĂ©cĂ©dentes ignorent ce type de fichier avec un " +"message d'avertissement tel que dĂ©crit prĂ©cĂ©demment. L'objectif est de faire " +"de ce format le format par dĂ©faut, et de rendre obsolète le format « One-" +"Line-Style » dĂ©crit plus haut, parce qu'il est plus facile Ă crĂ©er, Ă " +"Ă©tendre et Ă modifier pour les humains comme pour les machines, surtout s'il " +"inclut beaucoup de sources et/ou d'options. Les dĂ©veloppeurs qui travaillent " +"avec les sources apt ou les analysent sont fortement encouragĂ©s Ă ajouter la " +"prise en charge de ce format et Ă prendre contact avec l'Ă©quipe APT pour " +"coordonner et partager ce travail. Les utilisateurs sont libres d'adopter " +"dĂ©jĂ ce format, mais peuvent se confronter Ă des problèmes avec les " +"logiciels qui ne le gèrent pas encore." #. type: Content of: <refentry><refsect1><title> #: sources.list.5.xml -#, fuzzy -#| msgid "The deb and deb-src types" msgid "The deb and deb-src Types: General Format" -msgstr "Les types deb et deb-src." +msgstr "Les types deb et deb-src : format gĂ©nĂ©ral" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml -#, fuzzy -#| msgid "" -#| "The <literal>deb</literal> type references a typical two-level Debian " -#| "archive, <filename>distribution/component</filename>. The " -#| "<literal>distribution</literal> is generally an archive name like " -#| "<literal>stable</literal> or <literal>testing</literal> or a codename " -#| "like <literal>&debian-stable-codename;</literal> or <literal>&debian-" -#| "testing-codename;</literal> while component is one of <literal>main</" -#| "literal>, <literal>contrib</literal> or <literal>non-free</literal>. The " -#| "<literal>deb-src</literal> type references a Debian distribution's source " -#| "code in the same form as the <literal>deb</literal> type. A <literal>deb-" -#| "src</literal> line is required to fetch source indexes." msgid "" "The <literal>deb</literal> type references a typical two-level Debian " "archive, <filename>distribution/component</filename>. The " @@ -7609,7 +7702,7 @@ msgid "" msgstr "" "Le type <literal>deb</literal> dĂ©crit une archive Debian classique Ă deux " "niveaux, <filename>distribution/composant</filename>. <literal>distribution</" -"literal> peut prendre l'une des valeurs suivantes : un nom d'archive tel que " +"literal> peut prendre l'une des valeurs suivantes : un nom de suite tel que " "<literal>stable</literal> ou <literal>testing</literal> ou bien un nom de " "code comme <literal>&debian-stable-codename;</literal> ou <literal>&debian-" "testing-codename;</literal>, alors que composant prend les valeurs : " @@ -7621,16 +7714,12 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml -#, fuzzy -#| msgid "" -#| "The format for a <filename>sources.list</filename> entry using the " -#| "<literal>deb</literal> and <literal>deb-src</literal> types is:" msgid "" "The format for two one-line-style entries using the <literal>deb</literal> " "and <literal>deb-src</literal> types is:" msgstr "" -"Le format d'une entrĂ©e dans <filename>sources.list</filename> utilisant les " -"types <literal>deb</literal> et <literal>deb-src</literal> est :" +"Le format de deux entrĂ©es du genre « One-Line-Style » utilisant les types " +"<literal>deb</literal> et <literal>deb-src</literal> est :" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -7639,6 +7728,8 @@ msgid "" "deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]\n" "deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]" msgstr "" +"deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]\n" +"deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]" #. type: Content of: <refentry><refsect1><para><literallayout> #: sources.list.5.xml @@ -7652,32 +7743,25 @@ msgid "" " option2: value2\n" " " msgstr "" +" Types: deb deb-src\n" +" URIs: uri\n" +" Suites: suite\n" +" Components: [component1] [component2] [...]\n" +" option1: value1\n" +" option2: value2\n" +" " #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml -#, fuzzy -#| msgid "" -#| "Alternatively a rfc822 style format is also supported: <placeholder type=" -#| "\"literallayout\" id=\"0\"/>" msgid "" "Alternatively the equivalent entry in deb822 style looks like this: " "<placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" -"Autrement, un autre format de style rfc822 est aussi gĂ©rĂ©Â : <placeholder " -"type=\"literallayout\" id=\"0\"/>" +"Autrement, l'entrĂ©e Ă©quivalente de style deb822 ressemble Ă ceci : " +"<placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml -#, fuzzy -#| msgid "" -#| "The URI for the <literal>deb</literal> type must specify the base of the " -#| "Debian distribution, from which APT will find the information it needs. " -#| "<literal>suite</literal> can specify an exact path, in which case the " -#| "components must be omitted and <literal>suite</literal> must end with a " -#| "slash (<literal>/</literal>). This is useful for the case when only a " -#| "particular sub-section of the archive denoted by the URI is of interest. " -#| "If <literal>suite</literal> does not specify an exact path, at least one " -#| "<literal>component</literal> must be present." msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " @@ -7693,21 +7777,12 @@ msgstr "" "besoin. <literal>suite</literal> peut spĂ©cifier le chemin exact : dans ce " "cas, on doit omettre les composants et <literal>suite</literal> doit se " "terminer par une barre oblique (<literal>/</literal>). C'est utile quand " -"seule une sous-section particulière de l'archive dĂ©crite par cet URI est " -"intĂ©ressante. Quand <literal>suite</literal> n'indique pas un chemin exact, " +"seul un sous-rĂ©pertoire particulier de l'archive dĂ©crite par cet URI est " +"intĂ©ressant. Quand <literal>suite</literal> n'indique pas un chemin exact, " "un <literal>composant</literal> au moins doit Ăªtre prĂ©sent." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml -#, fuzzy -#| msgid "" -#| "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</" -#| "literal> which expands to the Debian architecture (such as " -#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. " -#| "This permits architecture-independent <filename>sources.list</filename> " -#| "files to be used. In general this is only of interest when specifying an " -#| "exact path, <literal>APT</literal> will automatically generate a URI with " -#| "the current architecture otherwise." msgid "" "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</" "literal> which expands to the Debian architecture (such as <literal>amd64</" @@ -7727,20 +7802,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml -#, fuzzy -#| msgid "" -#| "In the traditional style sources.list format since only one distribution " -#| "can be specified per line it may be necessary to have multiple lines for " -#| "the same URI, if a subset of all available distributions or components at " -#| "that location is desired. APT will sort the URI list after it has " -#| "generated a complete set internally, and will collapse multiple " -#| "references to the same Internet host, for instance, into a single " -#| "connection, so that it does not inefficiently establish an FTP " -#| "connection, close it, do something else, and then re-establish a " -#| "connection to that same host. This feature is useful for accessing busy " -#| "FTP sites with limits on the number of simultaneous anonymous users. APT " -#| "also parallelizes connections to different hosts to more effectively deal " -#| "with sites with low bandwidth." msgid "" "Especially in the one-line-style format since only one distribution can be " "specified per line it may be necessary to have multiple lines for the same " @@ -7753,7 +7814,7 @@ msgid "" "connections to different hosts to more effectively deal with sites with low " "bandwidth." msgstr "" -"Lorsqu'on utilise le type de style de sources.list traditionnel, puisqu'on " +"Particulièrement lorsqu'on utilise le format « One-Line-Style », puisqu'on " "ne peut indiquer qu'une seule distribution par ligne, il peut Ăªtre " "nĂ©cessaire de disposer le mĂªme URI sur plusieurs lignes quand on veut " "accĂ©der Ă un sous-ensemble des distributions ou composants disponibles Ă " @@ -7763,8 +7824,8 @@ msgstr "" "connexion FTP, de la fermer, faire autre chose, puis d'Ă©tablir encore cette " "connexion. Cette fonctionnalitĂ© permet l'accès Ă des sites FTP surchargĂ©s " "qui limitent le nombre de connexions simultanĂ©es pour les utilisateurs " -"anonymes. APT parallĂ©lise aussi les connexions Ă diffĂ©rents hĂ´tes pour " -"tirer plus efficacement parti des sites Ă faible bande passante." +"anonymes. APT parallĂ©lise aussi les connexions Ă diffĂ©rents hĂ´tes pour tirer " +"plus efficacement parti des sites Ă faible bande passante." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -7783,13 +7844,13 @@ msgstr "" #: sources.list.5.xml #, no-wrap msgid "&sourceslist-list-format;" -msgstr "" +msgstr "&sourceslist-list-format;" #. type: Content of: <refentry><refsect1><para><literallayout> #: sources.list.5.xml #, no-wrap msgid "&sourceslist-sources-format;" -msgstr "" +msgstr "&sourceslist-sources-format;" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -7798,13 +7859,15 @@ msgid "" "line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or like " "this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>" msgstr "" +"Ă€ titre d'exemple, les sources de votre distribution au format « One-Line-" +"Style » pourraient ressembler Ă ceci : <placeholder type=\"literallayout\" " +"id=\"0\"/> ou Ă ceci au format de style deb822 : <placeholder type=" +"\"literallayout\" id=\"1\"/>" #. type: Content of: <refentry><refsect1><title> #: sources.list.5.xml -#, fuzzy -#| msgid "The deb and deb-src types" msgid "The deb and deb-src types: Options" -msgstr "Les types deb et deb-src." +msgstr "Les types deb et deb-src : options" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -7819,37 +7882,34 @@ msgid "" "names explicitly here. Unsupported options are silently ignored by all APT " "versions." msgstr "" +"Chaque entrĂ©e de source peut avoir des options spĂ©cifiĂ©es pour modifier la " +"source Ă laquelle accĂ©der et comment les donnĂ©es y sont rĂ©cupĂ©rĂ©es. Le " +"format, la syntaxe et les noms des options peuvent Ăªtre diffĂ©rents entre le " +"format « One-Line-Style » et le format de style deb822, mais les mĂªmes " +"options sont disponibles dans les deux formats. Pour simplifier, nous " +"listons les noms de champ avec deb822 et fournissons le nom « One-Line » " +"entre parenthèses. Il faut se souvenir que en plus du rĂ©glage explicite des " +"options multi-valeurs, il y a aussi l'option de les modifier en se basant " +"sur les valeurs par dĂ©faut, mais nous ne listons pas ces noms explicitement " +"ici. Les options non prises en charge sont ignorĂ©es par toutes les version " +"d'APT." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml -#, fuzzy -#| msgid "" -#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" -#| "replaceable>,…</literal> can be used to specify for which architectures " -#| "information should be downloaded. If this option is not set all " -#| "architectures defined by the <literal>APT::Architectures</literal> option " -#| "will be downloaded." msgid "" "<option>Architectures</option> (<option>arch</option>) is a multivalue " "option defining for which architectures information should be downloaded. If " "this option isn't set the default is all architectures as defined by the " "<option>APT::Architectures</option> config option." msgstr "" -"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" -"replaceable>,…</literal> peut Ăªtre utilisĂ© pour indiquer les architectures " -"pour lesquelles l'information doit Ăªtre tĂ©lĂ©chargĂ©e. Si cette option n'est " -"pas utilisĂ©e, toutes les architectures dĂ©finies par l'option <literal>APT::" -"Architectures</literal> sera tĂ©lĂ©chargĂ©e." +"<option>Architectures</option> (<option>arch</option>) est une option " +"multivaleur pour dĂ©finir les architectures pour lesquelles l'information " +"doit Ăªtre tĂ©lĂ©chargĂ©e. Si cette option n'est pas utilisĂ©e, l'option par " +"dĂ©faut est toutes les architectures dĂ©finies par l'option de configuration " +"<literal>APT::Architectures</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml -#, fuzzy -#| msgid "" -#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" -#| "replaceable>,…</literal> can be used to specify for which architectures " -#| "information should be downloaded. If this option is not set all " -#| "architectures defined by the <literal>APT::Architectures</literal> option " -#| "will be downloaded." msgid "" "<option>Languages</option> (<option>lang</option>) is a multivalue option " "defining for which languages information such as translated package " @@ -7857,11 +7917,12 @@ msgid "" "all languages as defined by the <option>Acquire::Languages</option> config " "option." msgstr "" -"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" -"replaceable>,…</literal> peut Ăªtre utilisĂ© pour indiquer les architectures " -"pour lesquelles l'information doit Ăªtre tĂ©lĂ©chargĂ©e. Si cette option n'est " -"pas utilisĂ©e, toutes les architectures dĂ©finies par l'option <literal>APT::" -"Architectures</literal> sera tĂ©lĂ©chargĂ©e." +"<option>Languages</option> (<option>lang</option>) est une option " +"multivaleur pour dĂ©finir les langues pour lesquelles les informations, " +"telles que les descriptions de paquet traduites, doivent Ăªtre tĂ©lĂ©chargĂ©es. " +"Si cette option n'est pas utilisĂ©e, l'option par dĂ©faut est toutes les " +"langues dĂ©finies par l'option de configuration <option>Acquire::Languages</" +"option>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml @@ -7874,6 +7935,14 @@ msgid "" "be enabled or disabled by using the <literal>Identifier</literal> field as " "an option with a boolean value instead of using this multivalue option." msgstr "" +"<option>Targets</option> (<option>target</option>) est une option " +"multivaleur pour dĂ©finir les cibles qu'apt essaiera d’acquĂ©rir Ă partir de " +"cette source. Si cette option n'est pas spĂ©cifiĂ©e, la configuration par " +"dĂ©faut est dĂ©finie par le champ d'action de configuration <option>Acquire::" +"IndexTargets</option> (les cibles sont dĂ©finies par leur nom dans le champ " +"<literal>Created-By</literal>). De plus, les cibles peuvent Ăªtre activĂ©es ou " +"dĂ©sactivĂ©es en utilisant le champ <literal>Identifier</literal> comme option " +"avec une valeur boolĂ©enne plutĂ´t que d'utiliser cette option multivaleur." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml @@ -7887,6 +7956,15 @@ msgid "" "the value of configuration option <option>Acquire::PDiffs</option> which " "defaults to <literal>yes</literal>." msgstr "" +"<option>PDiffs</option> (<option>pdiffs</option>) est une valeur yes/no qui " +"contrĂ´le si APT doit essayer d'utiliser PDiffs pour mettre Ă jour des index " +"anciens plutĂ´t que de tĂ©lĂ©charger les nouveaux index en totalitĂ©. La valeur " +"de cette option est ignorĂ©e si le dĂ©pĂ´t n'annonce pas la disponibilitĂ© de " +"PDiffs. Elle a, par dĂ©faut, la valeur de l'option du mĂªme nom pour un " +"fichier particulier dĂ©fini dans le champ d'action <option>Acquire::" +"IndexTargets</option>, qui prend lui-mĂªme par dĂ©faut la valeur de l'option " +"de configuration <option>Acquire::PDiffs</option>, dont la valeur par dĂ©faut " +"est <literal>yes</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml @@ -7904,6 +7982,20 @@ msgid "" "option> scope, which itself defaults to the value of configuration option " "<option>Acquire::By-Hash</option> which defaults to <literal>yes</literal>." msgstr "" +"<option>By-Hash</option> (<option>by-hash</option>)peut avoir la valeur " +"<literal>yes</literal>, <literal>no</literal> ou <literal>force</literal> et " +"contrĂ´le si APT doit essayer d’acquĂ©rir des index grĂ¢ce Ă un URI construit Ă " +"partir de la somme de hachage du fichier attendu plutĂ´t que d'utiliser le " +"nom de fichier de stable bien connu de l'index. Son utilisation peut Ă©viter " +"des dĂ©calages de somme de hachage, mais nĂ©cessite un miroir de prise en " +"charge. Une valeur <literal>yes</literal> ou <literal>no</literal> active ou " +"dĂ©sactive l'utilisation de cette fonctionnalitĂ© si cette source indique sa " +"prise en charge, tandis que <literal>force</literal> activera la " +"fonctionnalitĂ© quel que soit ce que la source indique. Elle a, par dĂ©faut, " +"la valeur de l'option du mĂªme nom pour un fichier particulier dĂ©fini dans le " +"champ d'action <option>Acquire::IndexTargets</option>, qui prend lui-mĂªme " +"par dĂ©faut la valeur de l'option de configuration <option>Acquire::By-Hash</" +"option>, dont la valeur par dĂ©faut est <literal>yes</literal>." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -7913,6 +8005,11 @@ msgid "" "entries and can not be varied between different components. APT will try to " "detect and error out on such anomalies." msgstr "" +"Par ailleurs, si certaines options sont dĂ©finies, elles affectent " +"<emphasis>toutes</emphasis> les sources avec les mĂªmes URI et Suite, et donc " +"doivent Ăªtre dĂ©finies sur toutes ces entrĂ©es et ne peuvent Ăªtre modifiĂ©es " +"entre les diffĂ©rents composants. APT essaiera de dĂ©tecter et provoquera une " +"erreur avec de telles anomalies." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml @@ -7924,6 +8021,13 @@ msgid "" "set to <literal>yes</literal> they circumvent parts of &apt-secure; and " "should therefore not be used lightly!" msgstr "" +"<option>Allow-Insecure</option> (<option>allow-insecure</option>), " +"<option>Allow-Weak</option> (<option>allow-weak</option>) et <option>Allow-" +"Downgrade-To-Insecure</option> (<option>allow-downgrade-to-insecure</" +"option>) sont des valeurs boolĂ©ennes dont la valeur par dĂ©faut est " +"<literal>no</literal>. Si elles sont dĂ©finies Ă <literal>yes</literal>, " +"elles contournent certains Ă©lĂ©ments d'&apt-secure; et par consĂ©quent ne " +"devraient pas utilisĂ©es Ă la lĂ©gère." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml @@ -7940,6 +8044,18 @@ msgid "" "even if the authentication checks passed successfully. The default value " "can't be set explicitly." msgstr "" +"<option>Trusted</option> (<option>trusted</option>) comporte trois valeurs " +"d'Ă©tat qui dĂ©finissent par dĂ©faut si APT dĂ©cide de considĂ©rer une source " +"comme sĂ»re ou doit lancer un avertissement avant qu'un paquet soit, par " +"exemple, installĂ© Ă partir de cette source. Cette option peut Ăªtre utilisĂ©e " +"pour outrepasser cette dĂ©cision. La valeur <literal>yes</literal> dit Ă APT " +"de considĂ©rer cette source comme sĂ»re, mĂªme si elle Ă©choue au test " +"d'authentification. Elle dĂ©sactive des Ă©lĂ©ments d'&apt-secure; et elle ne " +"devrait Ăªtre utilisĂ©e que dans un contexte local et sĂ©curisĂ© si possible, " +"parce qu'autrement elle ouvre une brèche dans la sĂ©curitĂ©. La valeur " +"<literal>no</literal> fait le contraire et fait que la source est traitĂ©e " +"comme non sĂ»re, mĂªme si les tests d'authentification sont rĂ©ussis. La valeur " +"par dĂ©faut ne peut pas Ăªtre dĂ©finie explicitement." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml @@ -7956,6 +8072,20 @@ msgid "" "previously acquired <filename>Release</filename> file. Otherwise all keys " "in the trusted keyrings are considered valid signers for this repository." msgstr "" +"<option>Signed-By</option> (<option>signed-by</option>) est soit un chemin " +"absolu vers un fichier de trousseau de clĂ©s (qui doit Ăªtre accessible en " +"lecture pour l'utilisateur <literal>_apt</literal>, et donc, il faut " +"s'assurer que tout le monde a le droit de lecture sur le fichier) ou une ou " +"plusieurs empreintes de clĂ©s situĂ©es soit dans le trousseau " +"<filename>trusted.gpg</filename>, soit dans les trousseaux du rĂ©pertoire " +"<filename>trusted.gpg.d/</filename> (voir <command>apt-key fingerprint</" +"command>). Si cette option est dĂ©finie, seule la ou les clĂ©s dans ce " +"trousseau, ou seules les clĂ©s avec ces empreintes sont utilisĂ©es pour la " +"vĂ©rification du rĂ©pertoire par &apt-secure;. Elle possède la valeur par " +"dĂ©faut de l'option du mĂªme nom si elle a Ă©tĂ© dĂ©finie dans le fichier " +"<filename>Release</filename> rĂ©cupĂ©rĂ© auparavant. Autrement, toutes les clĂ©s " +"des trousseaux de confiance sont considĂ©rĂ©es comme des signatures valables " +"pour ce dĂ©pĂ´t." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml @@ -7973,6 +8103,20 @@ msgid "" "literal>. Defaults to the value of configuration option <option>Acquire::" "Check-Valid-Until</option> which itself defaults to <literal>yes</literal>." msgstr "" +"<option>Check-Valid-Until</option> (<option>check-valid-until</option>) est " +"une valeur yes/no qui dĂ©termine si APT doit tenter de dĂ©tecter les attaques " +"par replay. Un crĂ©ateur de dĂ©pĂ´t peut dĂ©clarer une pĂ©riode pendant laquelle " +"les donnĂ©es fournies par le dĂ©pĂ´t peuvent Ăªtre considĂ©rĂ©es comme valables, " +"une fois ce dĂ©lai Ă©chu, et si les donnĂ©es n'ont pas Ă©tĂ© fournies, elles sont " +"considĂ©rĂ©es comme expirĂ©es, et un message d'erreur est envoyĂ©. En plus " +"d'accroĂ®tre la sĂ©curitĂ©, puisqu'un attaquant malveillant ne peut plus " +"envoyer des donnĂ©es anciennes pour empĂªcher un utilisateur de mettre Ă " +"niveau vers une nouvelle version, elle facilite l'identification de miroirs " +"qui ne sont plus mis Ă jour. NĂ©anmoins, certains dĂ©pĂ´ts, comme les archives " +"historiques ne sont plus mis Ă jour Ă dessein, aussi cette vĂ©rification peut " +"Ăªtre dĂ©sactivĂ©e en rĂ©glant cette option Ă <literal>no</literal>. Elle " +"possède la valeur par dĂ©faut de l'option <option>Acquire::Check-Valid-Until</" +"option> qui elle-mĂªme possède la valeur <literal>yes</literal> par dĂ©faut." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml @@ -7989,6 +8133,19 @@ msgid "" "<option>Acquire::Min-ValidTime</option> and <option>Acquire::Max-ValidTime</" "option> which are both unset by default." msgstr "" +"<option>Valid-Until-Min</option> (<option>valid-until-min</option>) et " +"<option>Valid-Until-Max</option> (<option>valid-until-max</option>) peuvent " +"Ăªtre utilisĂ©es pour augmenter ou diminuer la durĂ©e, en secondes pendant " +"laquelle les donnĂ©es de ce dĂ©pĂ´t sont considĂ©rĂ©es comme valables. -Max peut " +"Ăªtre particulièrement utile pour dĂ©finir une valeur propre si le dĂ©pĂ´t ne " +"fournit pas de champ Valid-Until dans son fichier Release, tandis que -Min " +"peut Ăªtre utilisĂ© pour augmenter la durĂ©e de validitĂ© sur des miroirs " +"(locaux), rarement mis Ă jour, d'une archive plus frĂ©quemment mise Ă jour " +"mais moins accessible (qui est aussi dans le sources.list), plutĂ´t que de " +"dĂ©sactiver totalement la vĂ©rification. Elle possède la valeur par dĂ©faut des " +"options de configuration <option>Acquire::Min-ValidTime</option> et " +"<option>Acquire::Max-ValidTime</option> qui toutes les deux ne sont pas " +"dĂ©finies par dĂ©faut." #. type: Content of: <refentry><refsect1><title> #: sources.list.5.xml @@ -7998,7 +8155,7 @@ msgstr "SpĂ©cification des URI" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml msgid "The currently recognized URI types are:" -msgstr "Les types d'URI actuellement reconnues sont :" +msgstr "Les types d'URI actuellement reconnus sont :" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml @@ -8170,10 +8327,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml -#, fuzzy -#| msgid "Source line for the above" msgid "Sources specification for the above." -msgstr "La prĂ©cĂ©dente ligne, mais pour les sources." +msgstr "Indication des sources pour les lignes prĂ©cĂ©dentes." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8354,15 +8509,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml -#, fuzzy -#| msgid "" -#| "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " -#| "directory, and uses only files found under <filename>unstable/binary-" -#| "i386</filename> on i386 machines, <filename>unstable/binary-amd64</" -#| "filename> on amd64, and so forth for other supported architectures. [Note " -#| "this example only illustrates how to use the substitution variable; " -#| "official debian archives are not structured like this] <placeholder type=" -#| "\"literallayout\" id=\"0\"/>" msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -8378,8 +8524,9 @@ msgstr "" "<filename>unstable/binary-amd64</filename> pour les machines amd64 et ainsi " "de suite pour les autres architectures reconnues. [Notez que cet exemple " "montre seulement la manière d'utiliser la variable Ă substituer, les " -"archives Debian n'Ă©tant plas structurĂ©es de cette manière.] <placeholder " -"type=\"literallayout\" id=\"0\"/>" +"archives Debian officielles n'Ă©tant pas structurĂ©es de cette manière.] " +"<placeholder type=\"literallayout\" id=\"0\"/> <placeholder type=" +"\"literallayout\" id=\"1\"/>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8387,6 +8534,9 @@ msgid "" "Uses HTTP to get binary packages as well as sources from the stable, testing " "and unstable suites and the components main and contrib." msgstr "" +"Utiliser HTTP pour pouvoir obtenir les paquets binaires ainsi que les " +"sources des suites stable, testing et unstable et des composants main et " +"contrib." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8399,6 +8549,12 @@ msgid "" "deb http://deb.debian.org/debian unstable main contrib\n" "deb-src http://deb.debian.org/debian unstable main contrib" msgstr "" +"deb http://deb.debian.org/debian stable main contrib\n" +"deb-src http://deb.debian.org/debian stable main contrib\n" +"deb http://deb.debian.org/debian testing main contrib\n" +"deb-src http://deb.debian.org/debian testing main contrib\n" +"deb http://deb.debian.org/debian unstable main contrib\n" +"deb-src http://deb.debian.org/debian unstable main contrib" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml @@ -8409,6 +8565,10 @@ msgid "" "Suites: stable testing unstable\n" "Components: main contrib\n" msgstr "" +"Types: deb deb-src\n" +"URIs: http://deb.debian.org/debian\n" +"Suites: stable testing unstable\n" +"Components: main contrib\n" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml @@ -8642,19 +8802,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml -#, fuzzy -#| msgid "" -#| "The <literal>release</literal> command generates a Release file from a " -#| "directory tree. It recursively searches the given directory for " -#| "uncompressed <filename>Packages</filename> and <filename>Sources</" -#| "filename> files and ones compressed with <command>gzip</command>, " -#| "<command>bzip2</command> or <command>lzma</command> as well as " -#| "<filename>Release</filename> and <filename>md5sum.txt</filename> files by " -#| "default (<literal>APT::FTPArchive::Release::Default-Patterns</literal>). " -#| "Additional filename patterns can be added by listing them in " -#| "<literal>APT::FTPArchive::Release::Patterns</literal>. It then writes to " -#| "stdout a <filename>Release</filename> file containing an MD5, SHA1 and " -#| "SHA256 digest for each file." msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for uncompressed " @@ -8670,15 +8817,17 @@ msgid "" msgstr "" "La commande <literal>release</literal> crĂ©e un fichier Release Ă partir " "d'une arborescence. Elle recherche rĂ©cursivement dans le rĂ©pertoire indiquĂ© " -"des fichiers <filename>Packages</filename> et <filename>Sources</filename> " -"non compressĂ©s et compressĂ©s avec <command>gzip</command>, <command>bzip2</" -"command> ou <command>lzma</command> ainsi que des fichiers " -"<filename>Release</filename> et <filename>md5sum.txt</filename> par dĂ©faut " -"(<literal>APT::FTPArchive::Release::Default-Patterns</literal>). Des motifs " -"supplĂ©mentaires pour les noms de fichiers peuvent Ăªtre ajoutĂ©s en les " -"mentionnant dans <literal>APT::FTPArchive::Release::Patterns</literal>. Le " -"fichier <filename>Release</filename> est ensuite affichĂ© et comporte des " -"sommes de contrĂ´le MD5, SHA1 et SHA256 pour chaque fichier." +"des fichiers <filename>Packages</filename>, <filename>Sources</filename>, " +"<filename>Contents</filename>, <filename>Components</filename> et " +"<filename>icons</filename> non compressĂ©s et compressĂ©s ainsi que des " +"fichiers <filename>Release</filename>, <filename>Index</filename> et " +"<filename>md5sum.txt</filename> par dĂ©faut (<literal>APT::FTPArchive::" +"Release::Default-Patterns</literal>). Des motifs supplĂ©mentaires pour les " +"noms de fichiers peuvent Ăªtre ajoutĂ©s en les mentionnant dans <literal>APT::" +"FTPArchive::Release::Patterns</literal>. Le fichier <filename>Release</" +"filename> est ensuite affichĂ© sur la sortie standard et comporte (par " +"dĂ©faut) des sommes de contrĂ´le MD5, SHA1 et SHA256 et SHA512 pour chaque " +"fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml @@ -8824,12 +8973,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml -#, fuzzy -#| msgid "" -#| "Sets the default compression schemes to use for the package index files. " -#| "It is a string that contains a space separated list of at least one of: " -#| "'.' (no compression), 'gzip' and 'bzip2'. The default for all compression " -#| "schemes is '. gzip'." msgid "" "Sets the default compression schemes to use for the package index files. It " "is a string that contains a space separated list of at least one of the " @@ -8837,9 +8980,10 @@ msgid "" "configuration scope. The default for all compression schemes is '. gzip'." msgstr "" "Indique comment sont compressĂ©s les fichiers d'index. C'est une chaĂ®ne qui " -"contient des valeurs sĂ©parĂ©es par des espaces ; elle contient au moins l'une " -"des valeurs suivantes : « . » (pas de compression), « gzip », « bzip2 ». " -"Par dĂ©faut, c'est la chaĂ®ne « . gzip »." +"contient une liste sĂ©parĂ©e par des espaces qui contient au moins l'un des " +"compresseurs configurĂ© Ă travers le champ d'action de configuration " +"<option>APT::Compressor</option>. La valeur par dĂ©faut pour tous les schĂ©mas " +"de compression est « . gzip »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml @@ -9163,6 +9307,13 @@ msgid "" "include information about architecture <literal>all</literal> packages in " "all files as they will be available in a dedicated file." msgstr "" +"C'est une liste de toutes les architectures sĂ©parĂ©es par des espaces qui " +"appartiennent Ă chaque section. L'architecture spĂ©ciale « source » indique " +"que l'arborescence est une arborescence de sources. L'architecture « all » " +"indique que les fichiers spĂ©cifiques Ă l'architecture comme " +"<filename>Packages</filename> ne devraient pas inclure d'informations sur " +"les paquets de l'architecture <literal>all</literal> dans tous les fichiers " +"comme elles devraient Ăªtre disponibles dans un fichier dĂ©diĂ©." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml @@ -9545,7 +9696,7 @@ msgstr "Version &apt-product-version;" #. type: Content of: <book><bookinfo><abstract><para> #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "" "Ce document fournit un aperçu des mĂ©thode d'utilisation du gestionnaire de " "paquets APT." @@ -9967,9 +10118,9 @@ msgid "" "\n" " URL [http://llug.sep.bnl.gov/debian]:\n" msgstr "" -" RĂ©glage de a liste des emplacements sources de distribution\n" +" RĂ©glage de la liste des emplacements sources de distribution\n" "\n" -" Veuillez indiquer l'URL de base de la distribution Debian.\n" +" Veuillez indiquer l'URL de base de la distribution Debian.\n" " Les schĂ©mas d'accès connus sont : http file\n" "\n" " Exemple:\n" @@ -10208,7 +10359,7 @@ msgid "" "# apt-get check\n" "Reading Package Lists... Done\n" "Building Dependency Tree... Done\n" -"You might want to run apt-get -f install' to correct these.\n" +"You might want to run 'apt --fix-broken install' to correct these.\n" "Sorry, but the following packages have unmet dependencies:\n" " 9fonts: Depends: xlib6g but it is not installed\n" " uucp: Depends: mailx but it is not installed\n" @@ -10224,7 +10375,7 @@ msgstr "" "# apt-get check\n" "Lecture de la liste des paquets... Fait\n" "Construction de l'arbre des dĂ©pendances... Fait\n" -"Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes.\n" +"Vous pouvez lancer « apt --fix-broken install » pour corriger ces problèmes.\n" "Les paquets suivants contiennent des dĂ©pendances non satisfaites :\n" " 9fonts: Depends: xlib6g mais il n'est pas installĂ©\n" " uucp: Depends: mailx mais il n'est pas installĂ©\n" diff --git a/doc/po/it.po b/doc/po/it.po index 85283aa72..b7fb809c6 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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\n" "PO-Revision-Date: 2015-12-27 21:26+0200\n" "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" @@ -1987,6 +1987,19 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml +#, fuzzy +#| msgid "" +#| "Only process architecture-dependent build-dependencies. Configuration " +#| "Item: <literal>APT::Get::Arch-Only</literal>." +msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: <literal>APT::Get::Indep-Only</literal>." +msgstr "" +"Elabora solo le dipendenze di compilazione dipendenti dall'architettura. " +"Voce di configurazione: <literal>APT::Get::Arch-Only</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "can be useful while working with local repositories, but is a huge security " @@ -2853,7 +2866,7 @@ msgstr "Elenca le chiavi fidate." #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With <command>adv --recv-key</command> you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are <emphasis>no</emphasis> checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -9717,7 +9730,7 @@ msgstr "Versione &apt-product-version;" #. type: Content of: <book><bookinfo><abstract><para> #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "" "Questo documento fornisce una panoramica su come usare il gestore di " "pacchetti APT." @@ -10358,7 +10371,7 @@ msgid "" "# apt-get check\n" "Reading Package Lists... Done\n" "Building Dependency Tree... Done\n" -"You might want to run apt-get -f install' to correct these.\n" +"You might want to run 'apt --fix-broken install' to correct these.\n" "Sorry, but the following packages have unmet dependencies:\n" " 9fonts: Depends: xlib6g but it is not installed\n" " uucp: Depends: mailx but it is not installed\n" @@ -10374,7 +10387,7 @@ msgstr "" "# apt-get check\n" "Lettura elenco pacchetti... Fatto\n" "Generazione albero delle dipendenze... Fatto\n" -"Ăˆ utile eseguire \"run apt-get -f install\" per correggere ciĂ².\n" +"Ăˆ utile eseguire \"run apt --fix-broken install\" per correggere ciĂ².\n" "I seguenti pacchetti hanno dipendenze non soddisfatte:\n" " 9fonts: Dipende: xlib6g ma non è installato\n" " uucp: Dipende: mailx ma non è installato\n" @@ -13309,7 +13322,7 @@ msgstr "che userĂ gli archivi giĂ scaricati e presenti sul disco." #~ "The binary override file is fully compatible with &dpkg-scanpackages;. It " #~ "contains 4 fields separated by spaces. The first field is the package " #~ "name, the second is the priority to force that package to, the third is " -#~ "the the section to force that package to and the final field is the " +#~ "the section to force that package to and the final field is the " #~ "maintainer permutation field." #~ msgstr "" #~ "Il file override binario è completamente compatibile con &dpkg-" diff --git a/doc/po/ja.po b/doc/po/ja.po index 84d25ec5e..d85b6a529 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -1,5 +1,5 @@ # Translation of apt package man pages -# Copyright (C) 2003-2016 Debian Japanese List <debian-japanese@lists.debian.org> +# Copyright (C) 2003-2017 Debian Japanese List <debian-japanese@lists.debian.org> # This file is distributed under the same license as the apt package. # # Translators: @@ -8,10 +8,10 @@ # msgid "" msgstr "" -"Project-Id-Version: apt-doc 1.3\n" +"Project-Id-Version: apt-doc 1.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-11-25 23:46+0100\n" -"PO-Revision-Date: 2016-09-03 03:30+0900\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" "Language: ja\n" @@ -1908,6 +1908,15 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: <literal>APT::Get::Indep-Only</literal>." +msgstr "" +"構築ä¾å˜é–¢ä¿‚ă®è§£æ±ºă‚’ă€ă‚¢ăƒ¼ă‚ăƒ†ă‚¯ăƒăƒ£ă«ä¾å˜ă—ăªă„ă‚‚ă®ă®ă¿è¡Œă„ă¾ă™ă€‚è¨å®é …ç›®: " +"<literal>APT::Get::Arch-Only</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml +msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "can be useful while working with local repositories, but is a huge security " "risk if data authenticity isn't ensured in another way by the user itself. " @@ -2666,7 +2675,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-key.8.xml msgid "Supported keyring files" -msgstr "" +msgstr "サăƒăƒ¼ăƒˆă™ă‚‹ă‚ăƒ¼ăƒªăƒ³ă‚°ăƒ•ă‚¡ă‚¤ăƒ«" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml @@ -2677,6 +2686,12 @@ msgid "" "keyring files. Binary keyring files intended to be used with any apt version " "should therefore always be created with <command>gpg --export</command>." msgstr "" +"apt-key ă§ă¯æ‹¡å¼µåă€Œ<literal>gpg</literal>ă€ă®ä»˜ă‘ă‚‰ă‚ŒăŸ OpenPGP ă®ăƒă‚¤ăƒăƒªå½¢" +"å¼ (ă„ă‚ă‚†ă‚‹ă€ŒGPG ă‚ăƒ¼å…¬é–‹ç”¨ăƒªăƒ³ă‚°ă€) ă‚’å録ă™ă‚‹ăƒ•ă‚¡ă‚¤ăƒ«ă ă‘をサăƒăƒ¼ăƒˆă—ă¾" +"ă™ă€‚&gpg; ă®ă‚‚ă£ă¨æ–°ă—ă„ăƒăƒ¼ă‚¸ăƒ§ăƒ³ă§å°å…¥ă•ă‚Œă¦ă‚ăƒ¼ăƒªăƒ³ă‚°ăƒ•ă‚¡ă‚¤ăƒ«ă®ăƒ‡ăƒ•ă‚©ăƒ«ăƒˆ" +"ă¨ăªă£ă¦ă„ă‚‹ă‚ăƒ¼ăƒœăƒƒă‚¯ă‚¹ă®ăƒ‡ăƒ¼ă‚¿ăƒ™ăƒ¼ă‚¹å½¢å¼ă¯ă‚µăƒăƒ¼ăƒˆă—ă¾ă›ă‚“。ăă®ăŸă‚ă€ăƒăƒ¼" +"ă‚¸ăƒ§ăƒ³ă‚’å•ă‚ă apt ă§åˆ©ç”¨ă™ă‚‹ăŸă‚ă®ăƒă‚¤ăƒăƒªă‚ăƒ¼ăƒªăƒ³ă‚°ăƒ•ă‚¡ă‚¤ăƒ«ă®ä½œæˆă«ă¯å¸¸ă« " +"<command>gpg --export</command> ă‚’ä½¿ă£ă¦ăă ă•ă„。" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml @@ -2686,6 +2701,10 @@ msgid "" "with the \"<literal>asc</literal>\" extension instead which can be created " "with <command>gpg --armor --export</command>." msgstr "" +"ă¾ăŸă€ä½œæˆă—ăŸă‚ăƒ¼ăƒªăƒ³ă‚°ă‚’åˆ©ç”¨ă™ă‚‹ă‚·ă‚¹ăƒ†ăƒ ă«ă‚¤ăƒ³ă‚¹ăƒˆăƒ¼ăƒ«ă•ă‚Œă¦ă„ă‚‹ apt ă®ăƒăƒ¼" +"ă‚¸ăƒ§ăƒ³ăŒå…¨ă¦ 1.4 以é™ă§ă‚ă‚Œă°ă€<command>gpg --armor --export</command> ă§ä½œæˆ" +"ă™ă‚‹ă€æ‹¡å¼µåă«ă€Œ<literal>asc</literal>ă€ă‚’付ă‘ă‚‰ă‚ŒăŸä¿è·ä»˜ăă‚¢ă‚¹ă‚ăƒ¼å½¢å¼ă‚’代" +"ă‚ă‚ă«ä½¿ă†ă“ă¨ă‚‚ă§ăă¾ă™ă€‚ " #. type: Content of: <refentry><refsect1><title> #: apt-key.8.xml @@ -2716,22 +2735,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml -#, fuzzy -#| msgid "" -#| "Instead of using this command a keyring can be placed directly in the " -#| "<filename>/etc/apt/trusted.gpg.d/</filename> directory with a descriptive " -#| "name (same rules for filename apply as for &apt-conf; files) and " -#| "\"<literal>gpg</literal>\" as file extension." msgid "" "<emphasis>Note</emphasis>: Instead of using this command a keyring should be " "placed directly in the <filename>/etc/apt/trusted.gpg.d/</filename> " "directory with a descriptive name and either \"<literal>gpg</literal>\" or " "\"<literal>asc</literal>\" as file extension." msgstr "" -"ă“ă®ă‚³ăƒăƒ³ăƒ‰ă‚’使ă†ä»£ă‚ă‚ă«ă€ă‚ăƒ¼ăƒªăƒ³ă‚°ă«è¨˜è¿°ç„ăªåå‰ (ăƒ•ă‚¡ă‚¤ăƒ«åă«ă¤ă„ă¦ă¯ " -"&apt-conf; ăƒ•ă‚¡ă‚¤ăƒ«ă¨åŒä¸€ă®è¦å‰‡ăŒé©ç”¨ă•ă‚Œă¾ă™) ă‚’ä»˜ă‘ă€ăƒ•ă‚¡ă‚¤ăƒ«ă®æ‹¡å¼µåă‚’" -"ă€Œ<literal>gpg</literal>ă€ă¨ă—㦠<filename>/etc/apt/trusted.gpg.d/</" -"filename> ăƒ‡ă‚£ăƒ¬ă‚¯ăƒˆăƒªă«ç›´æ¥é…ç½®ă™ă‚‹æ–¹æ³•ă‚‚ă‚ă‚ă¾ă™ă€‚" +"<emphasis>注æ„</emphasis>: ă“ă®ă‚³ăƒăƒ³ăƒ‰ă‚’使ă†ä»£ă‚ă‚ă«ă€ă‚ăƒ¼ăƒªăƒ³ă‚°ă«è¨˜è¿°ç„ăªå" +"å‰ (ăƒ•ă‚¡ă‚¤ăƒ«åă«ă¤ă„ă¦ă¯ &apt-conf; ăƒ•ă‚¡ă‚¤ăƒ«ă¨åŒä¸€ă®è¦å‰‡ăŒé©ç”¨ă•ă‚Œă¾ă™) ă‚’ä»˜" +"ă‘ă¦ă€ăƒ•ă‚¡ă‚¤ăƒ«ă®æ‹¡å¼µåă‚’ă€Œ<literal>gpg</literal>ă€ă¾ăŸă¯ă€Œ<literal>asc</" +"literal>ă€ă¨ă—㦠<filename>/etc/apt/trusted.gpg.d/</filename> ăƒ‡ă‚£ăƒ¬ă‚¯ăƒˆăƒªă«" +"ç›´æ¥é…ç½®ă™ă‚‹æ–¹æ³•ă‚‚ă‚ă‚ă¾ă™ă€‚" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml @@ -2755,9 +2769,16 @@ msgstr "ä¿¡é ¼ă‚ăƒ¼ă¨ăă®ăƒ•ă‚£ăƒ³ă‚¬ăƒ¼ăƒ—ăƒªăƒ³ăƒˆă‚’ä¸€è¦§è¡¨ç¤ºă—ă¾ă™ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml +#, fuzzy +#| msgid "" +#| "Pass advanced options to gpg. With <command>adv --recv-key</command> you " +#| "can e.g. download key from keyservers directly into the the trusted set " +#| "of keys. Note that there are <emphasis>no</emphasis> checks performed, so " +#| "it is easy to completely undermine the &apt-secure; infrastructure if " +#| "used without care." msgid "" "Pass advanced options to gpg. With <command>adv --recv-key</command> you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are <emphasis>no</emphasis> checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -9277,8 +9298,12 @@ msgstr "ăƒăƒ¼ă‚¸ăƒ§ăƒ³ &apt-product-version;" #. type: Content of: <book><bookinfo><abstract><para> #: guide.dbk +#, fuzzy +#| msgid "" +#| "This document provides an overview of how to use the the APT package " +#| "manager." msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "æœ¬æ–‡æ›¸ă¯ APT ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ăƒăƒăƒ¼ă‚¸ăƒ£ă®ä½¿ă„æ–¹ă®æ¦‚è¦ă‚’æä¾›ă—ă¾ă™ă€‚" #. type: Content of: <book><bookinfo> @@ -9895,7 +9920,7 @@ msgid "" "# apt-get check\n" "Reading Package Lists... Done\n" "Building Dependency Tree... Done\n" -"You might want to run apt-get -f install' to correct these.\n" +"You might want to run 'apt --fix-broken install' to correct these.\n" "Sorry, but the following packages have unmet dependencies:\n" " 9fonts: Depends: xlib6g but it is not installed\n" " uucp: Depends: mailx but it is not installed\n" @@ -9912,7 +9937,7 @@ msgstr "" "ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ăƒªă‚¹ăƒˆă‚’èªă¿è¾¼ă‚“ă§ă„ă¾ă™... 完了\n" "ä¾å˜é–¢ä¿‚ăƒ„ăƒªăƒ¼ă‚’ä½œæˆă—ă¦ă„ă¾ă™\n" "ç¶æ…‹æƒ…å ±ă‚’èªă¿å–ă£ă¦ă„ă¾ă™... 完了\n" -"ă“ă‚Œă‚‰ă‚’ç›´ă™ăŸă‚ă«ă¯ 'apt-get -f install' ă‚’å®Ÿè¡Œă™ă‚‹å¿…è¦ăŒă‚ă‚‹ă‹ă‚‚ă—ă‚Œă¾ă›ă‚“。\n" +"ă“ă‚Œă‚‰ă‚’ç›´ă™ăŸă‚ă«ă¯ 'apt --fix-broken install' ă‚’å®Ÿè¡Œă™ă‚‹å¿…è¦ăŒă‚ă‚‹ă‹ă‚‚ă—ă‚Œă¾ă›ă‚“。\n" "下ă®ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ă«ă¯æº€ăŸă›ăªă„ä¾å˜é–¢ä¿‚ăŒă‚ă‚ă¾ă™:\n" " 9fonts: ä¾å˜: xlib6g ă—ă‹ă—ă€ă‚¤ăƒ³ă‚¹ăƒˆăƒ¼ăƒ«ă•ă‚Œă¦ă„ă¾ă›ă‚“\n" " uucp: ä¾å˜: mailx ă—ă‹ă—ă€ă‚¤ăƒ³ă‚¹ăƒˆăƒ¼ăƒ«ă•ă‚Œă¦ă„ă¾ă›ă‚“\n" diff --git a/doc/po/nl.po b/doc/po/nl.po index f63a0bbd9..6ee0e5818 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -1,13 +1,13 @@ # Translation of apt-doc to Dutch # This file is distributed under the same license as the apt-doc package. -# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2015, 2016. +# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2015, 2016, 2017. # msgid "" msgstr "" -"Project-Id-Version: apt-doc 1.3~rc4-nl\n" +"Project-Id-Version: apt-doc 1.4~beta4-nl\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-11-25 23:46+0100\n" -"PO-Revision-Date: 2016-09-16 17:33+0200\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\n" +"PO-Revision-Date: 2017-01-19 17:53+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" "Language: nl\n" @@ -2005,6 +2005,15 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: <literal>APT::Get::Indep-Only</literal>." +msgstr "" +"Enkel architectuur-onafhankelijke bouwvereisten verwerken. Configuratie-" +"item: <literal>APT::Get::Indep-Only</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml +msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "can be useful while working with local repositories, but is a huge security " "risk if data authenticity isn't ensured in another way by the user itself. " @@ -2808,7 +2817,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-key.8.xml msgid "Supported keyring files" -msgstr "" +msgstr "Ondersteunde sleutelbosbestanden" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml @@ -2819,6 +2828,13 @@ msgid "" "keyring files. Binary keyring files intended to be used with any apt version " "should therefore always be created with <command>gpg --export</command>." msgstr "" +"apt-key ondersteunt enkel de binaire indeling van OpenPGP (ook gekend als " +"\"GPG key public ring\") bij bestanden met de extensie \"<literal>gpg</" +"literal>\" en niet de database-indeling keybox (sleutelkistje) die in " +"recentere &gpg;-versies als standaard gebruikt wordt voor " +"sleutelbosbestanden. Binaire sleutelbosbestanden die met om het even welke " +"versie van apt gebruikt moeten kunnen worden, moeten daarom steeds " +"aangemaakt worden met het commando <command>gpg --export</command>." #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml @@ -2828,6 +2844,11 @@ msgid "" "with the \"<literal>asc</literal>\" extension instead which can be created " "with <command>gpg --armor --export</command>." msgstr "" +"In het andere geval, als op alle systemen die de aangemaakte sleutelbos " +"moeten gebruiken, minstens een versie van apt >= 1.4 geĂ¯nstalleerd is, kunt " +"u wel de ASCII-armor indeling met de extensie \"<literal>asc</literal>\" " +"gebruiken die met het commando <command>gpg --armor --export</command> " +"gecreĂ«erd kan worden." #. type: Content of: <refentry><refsect1><title> #: apt-key.8.xml @@ -2861,22 +2882,16 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml -#, fuzzy -#| msgid "" -#| "Instead of using this command a keyring can be placed directly in the " -#| "<filename>/etc/apt/trusted.gpg.d/</filename> directory with a descriptive " -#| "name (same rules for filename apply as for &apt-conf; files) and " -#| "\"<literal>gpg</literal>\" as file extension." msgid "" "<emphasis>Note</emphasis>: Instead of using this command a keyring should be " "placed directly in the <filename>/etc/apt/trusted.gpg.d/</filename> " "directory with a descriptive name and either \"<literal>gpg</literal>\" or " "\"<literal>asc</literal>\" as file extension." msgstr "" -"In plaats van dit commando te gebruiken, kunt u rechtstreeks in de map " -"<filename>/etc/apt/trusted.gpg.d/</filename> een sleutelbos plaatsen met een " -"descriptieve naam (voor de bestandsnaam gelden dezelfde regels als bij &apt-" -"conf;-bestanden) en \"<literal>gpg</literal>\" als bestandsextensie." +"<emphasis>Opmerking</emphasis>: In plaats van dit commando te gebruiken zou " +"u een sleutelbos rechtstreeks in de map <filename>/etc/apt/trusted.gpg.d/</" +"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><listitem><para> #: apt-key.8.xml @@ -2902,7 +2917,7 @@ msgstr "Som betrouwbare sleutels op met hun vingerafdruk." #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With <command>adv --recv-key</command> you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are <emphasis>no</emphasis> checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -9868,7 +9883,7 @@ msgstr "Versie &apt-product-version;" #. type: Content of: <book><bookinfo><abstract><para> #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "" "Dit document geeft een overzicht van het gebruik van de pakketmanager APT." @@ -10526,7 +10541,7 @@ msgid "" "# apt-get check\n" "Reading Package Lists... Done\n" "Building Dependency Tree... Done\n" -"You might want to run apt-get -f install' to correct these.\n" +"You might want to run 'apt --fix-broken install' to correct these.\n" "Sorry, but the following packages have unmet dependencies:\n" " 9fonts: Depends: xlib6g but it is not installed\n" " uucp: Depends: mailx but it is not installed\n" @@ -10542,23 +10557,18 @@ msgstr "" "# apt-get check\n" "Pakketlijsten worden ingelezen... Klaar\n" "Boom van vereisten wordt opgebouwd... Klaar\n" -"You might want to run apt-get -f install' to correct these.\n" -"(U zou 'apt-get -f install' kunnen uitvoeren om dit te repareren)\n" -"Sorry, but the following packages have unmet dependencies:\n" -"(Sorry, maar de volgende pakketten hebben niet-voldane vereisten:)\n" -" 9fonts: Depends: xlib6g but it is not installed\n" -" (9fonts: Vereist: xlib6g maar dit is niet geĂ¯nstalleerd)\n" -" uucp: Depends: mailx but it is not installed\n" -" blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n" -" adduser: Depends: perl-base but it is not installed\n" -" aumix: Depends: libgpmg1 but it is not installed\n" -" debiandoc-sgml: Depends: sgml-base but it is not installed\n" -" bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n" -" (bash-builtins: Vereist: bash (>= 2.01) maar 2.0-3 is geĂ¯nstalleerd)\n" -" cthugha: Depends: svgalibg1 but it is not installed\n" -" Depends: xlib6g (>= 3.3-5) but it is not installed\n" -" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)\n" -" (libreadlineg2: Conflicteert met:libreadline2 (<< 2.1-2.1))\n" +"U zou 'apt --fix-broken install' kunnen uitvoeren om dit te repareren.\n" +"Sorry, maar de volgende pakketten hebben niet-voldane vereisten:\n" +" 9fonts: Vereist: xlib6g maar dit is niet geĂ¯nstalleerd\n" +" uucp: Vereist: mailx maar dit is niet geĂ¯nstalleerd\n" +" blast: Vereist: xlib6g (>= 3.3-5) maar dit is niet geĂ¯nstalleerd\n" +" adduser: Vereist: perl-base maar dit is niet geĂ¯nstalleerd\n" +" aumix: Vereist: libgpmg1 maar dit is niet geĂ¯nstalleerd\n" +" debiandoc-sgml: Vereist: sgml-base maar dit is niet geĂ¯nstalleerd\n" +" bash-builtins: Vereist: bash (>= 2.01) maar 2.0-3 is geĂ¯nstalleerd\n" +" cthugha: Vereist: svgalibg1 maar dit is niet geĂ¯nstalleerd\n" +" Vereist: xlib6g (>= 3.3-5) maar dit is niet geĂ¯nstalleerd\n" +" libreadlineg2: Conflicteert met:libreadline2 (<< 2.1-2.1)\n" #. type: Content of: <book><chapter><section><para> #: guide.dbk diff --git a/doc/po/pl.po b/doc/po/pl.po index c91f75a7b..54c77f40c 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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -2022,6 +2022,22 @@ msgstr "" "komputera. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::Arch-Only</" "literal>." +# +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml +#, fuzzy +#| msgid "" +#| "Only process architecture-dependent build-dependencies. Configuration " +#| "Item: <literal>APT::Get::Arch-Only</literal>." +msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: <literal>APT::Get::Indep-Only</literal>." +msgstr "" +"Przetwarza tylko te pakiety z zależnoÅ›ciami wymaganymi do zbudowania pakietu " +"ze źrĂ³deÅ‚ (build-dependencies), ktĂ³re sÄ… zależnie od architektury " +"komputera. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::Arch-Only</" +"literal>." + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" @@ -2930,7 +2946,7 @@ msgstr "WyÅ›wietla listÄ™ zaufanych kluczy." #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With <command>adv --recv-key</command> you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are <emphasis>no</emphasis> checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -8736,7 +8752,7 @@ msgstr "" #. type: Content of: <book><bookinfo><abstract><para> #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "Dokument zawiera opis używania menadżera pakietĂ³w APT." #. type: Content of: <book><bookinfo> @@ -9376,7 +9392,7 @@ msgid "" "# apt-get check\n" "Reading Package Lists... Done\n" "Building Dependency Tree... Done\n" -"You might want to run apt-get -f install' to correct these.\n" +"You might want to run 'apt --fix-broken install' to correct these.\n" "Sorry, but the following packages have unmet dependencies:\n" " 9fonts: Depends: xlib6g but it is not installed\n" " uucp: Depends: mailx but it is not installed\n" @@ -9392,7 +9408,7 @@ msgstr "" "# apt-get check\n" "Czytanie list pakietĂ³w... Gotowe\n" "Budowanie drzewa zależnoÅ›ci... Gotowe\n" -"Należy uruchomić \"apt-get -f install\", aby je naprawić.\n" +"Należy uruchomić \"apt --fix-broken install\", aby je naprawić.\n" "NastÄ™pujÄ…ce pakiety majÄ… niespeÅ‚nione zależnoÅ›ci:\n" " 9fonts: Wymaga: xlib6g ale nie jest zainstalowany\n" " uucp: Wymaga: mailx ale nie jest zainstalowany\n" diff --git a/doc/po/pt.po b/doc/po/pt.po index 5d0e189fc..cbe9ae7ed 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.7\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\n" "PO-Revision-Date: 2014-08-29 00:34+0100\n" "Last-Translator: AmĂ©rico Monteiro <a_monteiro@gmx.com>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -1961,6 +1961,19 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml +#, fuzzy +#| msgid "" +#| "Only process architecture-dependent build-dependencies. Configuration " +#| "Item: <literal>APT::Get::Arch-Only</literal>." +msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: <literal>APT::Get::Indep-Only</literal>." +msgstr "" +"Apenas processa dependĂªncias de compilaĂ§Ă£o dependentes da arquitectura. Item " +"de ConfiguraĂ§Ă£o: <literal>APT::Get::Arch-Only</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "can be useful while working with local repositories, but is a huge security " @@ -2827,7 +2840,7 @@ msgstr "Lista as chaves de confiança." #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With <command>adv --recv-key</command> you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are <emphasis>no</emphasis> checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -9509,7 +9522,7 @@ msgstr "VersĂ£o &apt-product-version;" #. type: Content of: <book><bookinfo><abstract><para> #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "" "Este documento disponibiliza uma visĂ£o geral de como usar o gestor de " "pacotes APT." @@ -10140,7 +10153,7 @@ msgid "" "# apt-get check\n" "Reading Package Lists... Done\n" "Building Dependency Tree... Done\n" -"You might want to run apt-get -f install' to correct these.\n" +"You might want to run 'apt --fix-broken install' to correct these.\n" "Sorry, but the following packages have unmet dependencies:\n" " 9fonts: Depends: xlib6g but it is not installed\n" " uucp: Depends: mailx but it is not installed\n" @@ -10156,7 +10169,7 @@ msgstr "" "# apt-get check\n" "Reading Package Lists... Done\n" "Building Dependency Tree... Done\n" -"You might want to run apt-get -f install' to correct these.\n" +"You might want to run 'apt --fix-broken install' to correct these.\n" "Sorry, but the following packages have unmet dependencies:\n" " 9fonts: Depends: xlib6g but it is not installed\n" " uucp: Depends: mailx but it is not installed\n" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 0cccab459..5fb1f78d5 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -1360,6 +1360,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" +"Only process architecture-independent build-dependencies. Configuration " +"Item: <literal>APT::Get::Indep-Only</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml +msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "can be useful while working with local repositories, but is a huge security " "risk if data authenticity isn't ensured in another way by the user itself. " @@ -1981,7 +1988,7 @@ msgstr "" #: apt-key.8.xml msgid "" "Pass advanced options to gpg. With <command>adv --recv-key</command> you can " -"e.g. download key from keyservers directly into the the trusted set of keys. " +"e.g. download key from keyservers directly into the trusted set of keys. " "Note that there are <emphasis>no</emphasis> checks performed, so it is easy " "to completely undermine the &apt-secure; infrastructure if used without care." msgstr "" @@ -7106,7 +7113,7 @@ msgstr "" #. type: Content of: <book><bookinfo><abstract><para> #: guide.dbk msgid "" -"This document provides an overview of how to use the the APT package manager." +"This document provides an overview of how to use the APT package manager." msgstr "" #. type: Content of: <book><bookinfo> @@ -7548,7 +7555,7 @@ msgid "" "# apt-get check\n" "Reading Package Lists... Done\n" "Building Dependency Tree... Done\n" -"You might want to run apt-get -f install' to correct these.\n" +"You might want to run 'apt --fix-broken install' to correct these.\n" "Sorry, but the following packages have unmet dependencies:\n" " 9fonts: Depends: xlib6g but it is not installed\n" " uucp: Depends: mailx but it is not installed\n" diff --git a/doc/style.txt b/doc/style.txt index 7658b0314..cd5f8b677 100644 --- a/doc/style.txt +++ b/doc/style.txt @@ -50,7 +50,7 @@ standard library, but not for my code. Arguments and Ownership ~~~~~~~~~~~~~~~~~~~~~~~ [much of the code follows this now] -These guidlines should be followed except in two cases.. the first +These guidelines should be followed except in two cases.. the first is where it makes no sense, such as in a casting operator and the second is to retain API compatibility (this should be rare, since a change in the input almost always designates a change in ownership rules). diff --git a/ftparchive/CMakeLists.txt b/ftparchive/CMakeLists.txt index 799fd7335..bbd2848c1 100644 --- a/ftparchive/CMakeLists.txt +++ b/ftparchive/CMakeLists.txt @@ -1,5 +1,7 @@ include_directories(${BERKELEY_DB_INCLUDE_DIRS}) -# Create the executable tasks +# Definition of the C++ files used to build the program - note that this +# is expanded at CMake time, so you have to rerun cmake if you add or remove +# a file (you can just run cmake . in the build directory) file(GLOB_RECURSE source "*.cc") add_executable(apt-ftparchive ${source}) diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index 0ce15b3d6..ae8a7e991 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -140,7 +140,7 @@ GenContents::Node *GenContents::Grab(GenContents::Node *Top,const char *Name, // Collision! if (Res == 0) { - // See if this the the same package (multi-version dup) + // See if this is the same package (multi-version dup) if (Top->Package == Package || strcasecmp(Top->Package,Package) == 0) return Top; diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index eb17521eb..cac1d943d 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -364,7 +364,7 @@ PackagesWriter::PackagesWriter(FileFd * const GivenOutput, TranslationWriter * c string const &Arch, bool const IncludeArchAll) : FTWScanner(GivenOutput, Arch, IncludeArchAll), Db(DB), Stats(Db.Stats), TransWriter(transWriter) { - SetExts(".deb .udeb"); + SetExts(".deb .ddeb .udeb"); DeLinkLimit = 0; // Process the command line options @@ -411,7 +411,7 @@ bool PackagesWriter::DoPackage(string FileName) if (Delink(FileName,OriginalPath,Stats.DeLinkBytes,FileSize) == false) return false; - // Lookup the overide information + // Lookup the override information pkgTagSection &Tags = Db.Control.Section; string Package = Tags.FindS("Package"); string Architecture; @@ -659,7 +659,7 @@ bool SourcesWriter::DoPackage(string FileName) return _error->Error("Could not find a Source entry in the DSC '%s'",FileName.c_str()); Tags.Trim(); - // Lookup the overide information, finding first the best priority. + // Lookup the override information, finding first the best priority. string BestPrio; string Bins = Tags.FindS("Binary"); char Buffer[Bins.length() + 1]; diff --git a/methods/CMakeLists.txt b/methods/CMakeLists.txt index c4d28de64..128c61005 100644 --- a/methods/CMakeLists.txt +++ b/methods/CMakeLists.txt @@ -4,10 +4,10 @@ add_executable(copy copy.cc) add_executable(store store.cc) add_executable(gpgv gpgv.cc) add_executable(cdrom cdrom.cc) -#add_executable(http http.cc http_main.cc rfc2553emu.cc connect.cc server.cc) -add_executable(http http.cc rfc2553emu.cc connect.cc server.cc) -#add_executable(mirror mirror.cc http.cc rfc2553emu.cc connect.cc server.cc) -add_executable(https https.cc server.cc) +#add_executable(http http.cc http_main.cc rfc2553emu.cc connect.cc basehttp.cc) +add_executable(http http.cc rfc2553emu.cc connect.cc basehttp.cc) +#add_executable(mirror mirror.cc http.cc rfc2553emu.cc connect.cc basehttp.cc) +add_executable(https https.cc basehttp.cc) add_executable(ftp ftp.cc rfc2553emu.cc connect.cc) add_executable(rred rred.cc) add_executable(rsh rsh.cc) diff --git a/methods/server.cc b/methods/basehttp.cc index 0408dddfd..f79f26a7c 100644 --- a/methods/server.cc +++ b/methods/basehttp.cc @@ -29,26 +29,24 @@ #include <string> #include <vector> -#include "server.h" +#include "basehttp.h" #include <apti18n.h> /*}}}*/ using namespace std; -string ServerMethod::FailFile; -int ServerMethod::FailFd = -1; -time_t ServerMethod::FailTime = 0; +string BaseHttpMethod::FailFile; +int BaseHttpMethod::FailFd = -1; +time_t BaseHttpMethod::FailTime = 0; // ServerState::RunHeaders - Get the headers before the data /*{{{*/ // --------------------------------------------------------------------- /* Returns 0 if things are OK, 1 if an IO error occurred and 2 if a header parse error occurred */ -ServerState::RunHeadersResult ServerState::RunHeaders(FileFd * const File, +ServerState::RunHeadersResult ServerState::RunHeaders(RequestState &Req, const std::string &Uri) { - Reset(false); Owner->Status(_("Waiting for headers")); - do { string Data; @@ -57,35 +55,32 @@ ServerState::RunHeadersResult ServerState::RunHeaders(FileFd * const File, if (Owner->Debug == true) clog << "Answer for: " << Uri << endl << Data; - + for (string::const_iterator I = Data.begin(); I < Data.end(); ++I) { string::const_iterator J = I; for (; J != Data.end() && *J != '\n' && *J != '\r'; ++J); - if (HeaderLine(string(I,J)) == false) + if (Req.HeaderLine(string(I,J)) == false) return RUN_HEADERS_PARSE_ERROR; I = J; } // 100 Continue is a Nop... - if (Result == 100) + if (Req.Result == 100) continue; // Tidy up the connection persistence state. - if (Encoding == Closes && HaveContent == true) + if (Req.Encoding == RequestState::Closes && Req.HaveContent == true) Persistent = false; return RUN_HEADERS_OK; } - while (LoadNextResponse(false, File) == true); + while (LoadNextResponse(false, Req) == true); return RUN_HEADERS_IO_ERROR; } /*}}}*/ -// ServerState::HeaderLine - Process a header line /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool ServerState::HeaderLine(string Line) +bool RequestState::HeaderLine(string const &Line) /*{{{*/ { if (Line.empty() == true) return true; @@ -116,18 +111,18 @@ bool ServerState::HeaderLine(string Line) /* Check the HTTP response header to get the default persistence state. */ if (Major < 1) - Persistent = false; + Server->Persistent = false; else { if (Major == 1 && Minor == 0) { - Persistent = false; + Server->Persistent = false; } else { - Persistent = true; - if (PipelineAllowed) - Pipeline = true; + Server->Persistent = true; + if (Server->PipelineAllowed) + Server->Pipeline = true; } } @@ -151,6 +146,9 @@ bool ServerState::HeaderLine(string Line) if (stringcasecmp(Tag,"Content-Length:") == 0) { + auto ContentLength = strtoull(Val.c_str(), NULL, 10); + if (ContentLength == 0) + return true; if (Encoding == Closes) Encoding = Stream; HaveContent = true; @@ -159,7 +157,7 @@ bool ServerState::HeaderLine(string Line) if (Result == 416 || (Result >= 300 && Result < 400)) DownloadSizePtr = &JunkSize; - *DownloadSizePtr = strtoull(Val.c_str(), NULL, 10); + *DownloadSizePtr = ContentLength; if (*DownloadSizePtr >= std::numeric_limits<unsigned long long>::max()) return _error->Errno("HeaderLine", _("The HTTP server sent an invalid Content-Length header")); else if (*DownloadSizePtr == 0) @@ -180,7 +178,11 @@ bool ServerState::HeaderLine(string Line) return true; } - if (stringcasecmp(Tag,"Content-Range:") == 0) + // The Content-Range field only has a meaning in HTTP/1.1 for the + // 206 (Partial Content) and 416 (Range Not Satisfiable) responses + // according to RFC7233 "Range Requests", §4.2, so only consider it + // for such responses. + if ((Result == 416 || Result == 206) && stringcasecmp(Tag,"Content-Range:") == 0) { HaveContent = true; @@ -209,16 +211,16 @@ bool ServerState::HeaderLine(string Line) { if (stringcasecmp(Val,"close") == 0) { - Persistent = false; - Pipeline = false; + Server->Persistent = false; + Server->Pipeline = false; /* Some servers send error pages (as they are dynamically generated) for simplicity via a connection close instead of e.g. chunked, so assuming an always closing server only if we get a file + close */ if (Result >= 200 && Result < 300) - PipelineAllowed = false; + Server->PipelineAllowed = false; } else if (stringcasecmp(Val,"keep-alive") == 0) - Persistent = true; + Server->Persistent = true; return true; } @@ -240,7 +242,7 @@ bool ServerState::HeaderLine(string Line) std::string ranges = ',' + Val + ','; ranges.erase(std::remove(ranges.begin(), ranges.end(), ' '), ranges.end()); if (ranges.find(",bytes,") == std::string::npos) - RangesAllowed = false; + Server->RangesAllowed = false; return true; } @@ -248,42 +250,37 @@ bool ServerState::HeaderLine(string Line) } /*}}}*/ // ServerState::ServerState - Constructor /*{{{*/ -ServerState::ServerState(URI Srv, ServerMethod *Owner) : - DownloadSize(0), ServerName(Srv), TimeOut(120), Owner(Owner) +ServerState::ServerState(URI Srv, BaseHttpMethod *Owner) : + ServerName(Srv), TimeOut(120), Owner(Owner) { Reset(); } /*}}}*/ -bool ServerState::AddPartialFileToHashes(FileFd &File) /*{{{*/ +bool RequestState::AddPartialFileToHashes(FileFd &File) /*{{{*/ { File.Truncate(StartPos); - return GetHashes()->AddFD(File, StartPos); + return Server->GetHashes()->AddFD(File, StartPos); } /*}}}*/ -void ServerState::Reset(bool const Everything) /*{{{*/ +void ServerState::Reset() /*{{{*/ { - Major = 0; Minor = 0; Result = 0; Code[0] = '\0'; - TotalFileSize = 0; JunkSize = 0; StartPos = 0; - Encoding = Closes; time(&Date); HaveContent = false; - State = Header; MaximumSize = 0; - if (Everything) - { - Persistent = false; Pipeline = false; PipelineAllowed = true; - RangesAllowed = true; - } + Persistent = false; + Pipeline = false; + PipelineAllowed = true; + RangesAllowed = true; } /*}}}*/ -// ServerMethod::DealWithHeaders - Handle the retrieved header data /*{{{*/ +// BaseHttpMethod::DealWithHeaders - Handle the retrieved header data /*{{{*/ // --------------------------------------------------------------------- /* We look at the header data we got back from the server and decide what to do. Returns DealWithHeadersResult (see http.h for details). */ -ServerMethod::DealWithHeadersResult -ServerMethod::DealWithHeaders(FetchResult &Res) +BaseHttpMethod::DealWithHeadersResult +BaseHttpMethod::DealWithHeaders(FetchResult &Res, RequestState &Req) { // Not Modified - if (Server->Result == 304) + if (Req.Result == 304) { RemoveFile("server", Queue->DestFile); Res.IMSHit = true; @@ -300,26 +297,26 @@ ServerMethod::DealWithHeaders(FetchResult &Res) * redirect. Pass on those codes so the error handling kicks in. */ if (AllowRedirect - && (Server->Result > 300 && Server->Result < 400) - && (Server->Result != 300 // Multiple Choices - && Server->Result != 304 // Not Modified - && Server->Result != 306)) // (Not part of HTTP/1.1, reserved) + && (Req.Result > 300 && Req.Result < 400) + && (Req.Result != 300 // Multiple Choices + && Req.Result != 304 // Not Modified + && Req.Result != 306)) // (Not part of HTTP/1.1, reserved) { - if (Server->Location.empty() == true) + if (Req.Location.empty() == true) ; - else if (Server->Location[0] == '/' && Queue->Uri.empty() == false) + else if (Req.Location[0] == '/' && Queue->Uri.empty() == false) { URI Uri = Queue->Uri; if (Uri.Host.empty() == false) NextURI = URI::SiteOnly(Uri); else NextURI.clear(); - NextURI.append(DeQuoteString(Server->Location)); + NextURI.append(DeQuoteString(Req.Location)); if (Queue->Uri == NextURI) { SetFailReason("RedirectionLoop"); _error->Error("Redirection loop encountered"); - if (Server->HaveContent == true) + if (Req.HaveContent == true) return ERROR_WITH_CONTENT_PAGE; return ERROR_UNRECOVERABLE; } @@ -327,12 +324,12 @@ ServerMethod::DealWithHeaders(FetchResult &Res) } else { - NextURI = DeQuoteString(Server->Location); + NextURI = DeQuoteString(Req.Location); URI tmpURI = NextURI; if (tmpURI.Access.find('+') != std::string::npos) { _error->Error("Server tried to trick us into using a specific implementation: %s", tmpURI.Access.c_str()); - if (Server->HaveContent == true) + if (Req.HaveContent == true) return ERROR_WITH_CONTENT_PAGE; return ERROR_UNRECOVERABLE; } @@ -358,7 +355,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res) { SetFailReason("RedirectionLoop"); _error->Error("Redirection loop encountered"); - if (Server->HaveContent == true) + if (Req.HaveContent == true) return ERROR_WITH_CONTENT_PAGE; return ERROR_UNRECOVERABLE; } @@ -390,7 +387,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res) /* else pass through for error message */ } // retry after an invalid range response without partial data - else if (Server->Result == 416) + else if (Req.Result == 416) { struct stat SBuf; if (stat(Queue->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0) @@ -400,25 +397,25 @@ ServerMethod::DealWithHeaders(FetchResult &Res) { Hashes resultHashes(Queue->ExpectedHashes); FileFd file(Queue->DestFile, FileFd::ReadOnly); - Server->TotalFileSize = file.FileSize(); - Server->Date = file.ModificationTime(); + Req.TotalFileSize = file.FileSize(); + Req.Date = file.ModificationTime(); resultHashes.AddFD(file); HashStringList const hashList = resultHashes.GetHashStringList(); partialHit = (Queue->ExpectedHashes == hashList); } - else if ((unsigned long long)SBuf.st_size == Server->TotalFileSize) + else if ((unsigned long long)SBuf.st_size == Req.TotalFileSize) partialHit = true; if (partialHit == true) { // the file is completely downloaded, but was not moved - if (Server->HaveContent == true) + if (Req.HaveContent == true) { // nuke the sent error page - Server->RunDataToDevNull(); - Server->HaveContent = false; + Server->RunDataToDevNull(Req); + Req.HaveContent = false; } - Server->StartPos = Server->TotalFileSize; - Server->Result = 200; + Req.StartPos = Req.TotalFileSize; + Req.Result = 200; } else if (RemoveFile("server", Queue->DestFile)) { @@ -430,31 +427,31 @@ ServerMethod::DealWithHeaders(FetchResult &Res) /* We have a reply we don't handle. This should indicate a perm server failure */ - if (Server->Result < 200 || Server->Result >= 300) + if (Req.Result < 200 || Req.Result >= 300) { if (_error->PendingError() == false) { std::string err; - strprintf(err, "HttpError%u", Server->Result); + strprintf(err, "HttpError%u", Req.Result); SetFailReason(err); - _error->Error("%u %s", Server->Result, Server->Code); + _error->Error("%u %s", Req.Result, Req.Code); } - if (Server->HaveContent == true) + if (Req.HaveContent == true) return ERROR_WITH_CONTENT_PAGE; return ERROR_UNRECOVERABLE; } // This is some sort of 2xx 'data follows' reply - Res.LastModified = Server->Date; - Res.Size = Server->TotalFileSize; + Res.LastModified = Req.Date; + Res.Size = Req.TotalFileSize; return FILE_IS_OPEN; } /*}}}*/ -// ServerMethod::SigTerm - Handle a fatal signal /*{{{*/ +// BaseHttpMethod::SigTerm - Handle a fatal signal /*{{{*/ // --------------------------------------------------------------------- /* This closes and timestamps the open file. This is necessary to get - resume behavoir on user abort */ -void ServerMethod::SigTerm(int) + resume behavior on user abort */ +void BaseHttpMethod::SigTerm(int) { if (FailFd == -1) _exit(100); @@ -469,11 +466,11 @@ void ServerMethod::SigTerm(int) _exit(100); } /*}}}*/ -// ServerMethod::Fetch - Fetch an item /*{{{*/ +// BaseHttpMethod::Fetch - Fetch an item /*{{{*/ // --------------------------------------------------------------------- /* This adds an item to the pipeline. We keep the pipeline at a fixed depth. */ -bool ServerMethod::Fetch(FetchItem *) +bool BaseHttpMethod::Fetch(FetchItem *) { if (Server == nullptr || QueueBack == nullptr) return true; @@ -540,8 +537,8 @@ bool ServerMethod::Fetch(FetchItem *) return true; } /*}}}*/ -// ServerMethod::Loop - Main loop /*{{{*/ -int ServerMethod::Loop() +// BaseHttpMethod::Loop - Main loop /*{{{*/ +int BaseHttpMethod::Loop() { signal(SIGTERM,SigTerm); signal(SIGINT,SigTerm); @@ -595,7 +592,7 @@ int ServerMethod::Loop() if (Server->IsOpen() == false) QueueBack = Queue; - // Connnect to the host + // Connect to the host if (Server->Open() == false) { Fail(true); @@ -605,9 +602,10 @@ int ServerMethod::Loop() // Fill the pipeline. Fetch(0); - + + RequestState Req(this, Server.get()); // Fetch the next URL header data from the server. - switch (Server->RunHeaders(File, Queue->Uri)) + switch (Server->RunHeaders(Req, Queue->Uri)) { case ServerState::RUN_HEADERS_OK: break; @@ -646,7 +644,7 @@ int ServerMethod::Loop() // Decide what to do. FetchResult Res; Res.Filename = Queue->DestFile; - switch (DealWithHeaders(Res)) + switch (DealWithHeaders(Res, Req)) { // Ok, the file is Open case FILE_IS_OPEN: @@ -660,24 +658,23 @@ int ServerMethod::Loop() // we could do "Server->MaximumSize = Queue->MaximumSize" here // but that would break the clever pipeline messup detection // so instead we use the size of the biggest item in the queue - Server->MaximumSize = FindMaximumObjectSizeInQueue(); + Req.MaximumSize = FindMaximumObjectSizeInQueue(); - if (Server->HaveContent) - Result = Server->RunData(File); + if (Req.HaveContent) + Result = Server->RunData(Req); /* If the server is sending back sizeless responses then fill in the size now */ if (Res.Size == 0) - Res.Size = File->Size(); - + Res.Size = Req.File.Size(); + // Close the file, destroy the FD object and timestamp it FailFd = -1; - delete File; - File = 0; - + Req.File.Close(); + // Timestamp struct timeval times[2]; - times[0].tv_sec = times[1].tv_sec = Server->Date; + times[0].tv_sec = times[1].tv_sec = Req.Date; times[0].tv_usec = times[1].tv_usec = 0; utimes(Queue->DestFile.c_str(), times); @@ -758,9 +755,6 @@ int ServerMethod::Loop() // Hard internal error, kill the connection and fail case ERROR_NOT_FROM_SERVER: { - delete File; - File = 0; - Fail(); RotateDNS(); Server->Close(); @@ -770,7 +764,7 @@ int ServerMethod::Loop() // We need to flush the data, the header is like a 404 w/ error text case ERROR_WITH_CONTENT_PAGE: { - Server->RunDataToDevNull(); + Server->RunDataToDevNull(Req); Fail(); break; } @@ -779,8 +773,8 @@ int ServerMethod::Loop() case TRY_AGAIN_OR_REDIRECT: { // Clear rest of response if there is content - if (Server->HaveContent) - Server->RunDataToDevNull(); + if (Req.HaveContent) + Server->RunDataToDevNull(Req); Redirect(NextURI); break; } @@ -796,7 +790,7 @@ int ServerMethod::Loop() return 0; } /*}}}*/ -unsigned long long ServerMethod::FindMaximumObjectSizeInQueue() const /*{{{*/ +unsigned long long BaseHttpMethod::FindMaximumObjectSizeInQueue() const /*{{{*/ { unsigned long long MaxSizeInQueue = 0; for (FetchItem *I = Queue; I != 0 && I != QueueBack; I = I->Next) @@ -804,13 +798,13 @@ unsigned long long ServerMethod::FindMaximumObjectSizeInQueue() const /*{{{*/ return MaxSizeInQueue; } /*}}}*/ -ServerMethod::ServerMethod(std::string &&Binary, char const * const Ver,unsigned long const Flags) :/*{{{*/ - aptMethod(std::move(Binary), Ver, Flags), Server(nullptr), File(NULL), PipelineDepth(10), +BaseHttpMethod::BaseHttpMethod(std::string &&Binary, char const * const Ver,unsigned long const Flags) :/*{{{*/ + aptMethod(std::move(Binary), Ver, Flags), Server(nullptr), PipelineDepth(10), AllowRedirect(false), Debug(false) { } /*}}}*/ -bool ServerMethod::Configuration(std::string Message) /*{{{*/ +bool BaseHttpMethod::Configuration(std::string Message) /*{{{*/ { if (aptMethod::Configuration(Message) == false) return false; @@ -820,7 +814,7 @@ bool ServerMethod::Configuration(std::string Message) /*{{{*/ return true; } /*}}}*/ -bool ServerMethod::AddProxyAuth(URI &Proxy, URI const &Server) const /*{{{*/ +bool BaseHttpMethod::AddProxyAuth(URI &Proxy, URI const &Server) const /*{{{*/ { if (std::find(methodNames.begin(), methodNames.end(), "tor") != methodNames.end() && Proxy.User == "apt-transport-tor" && Proxy.Password.empty()) diff --git a/methods/server.h b/methods/basehttp.h index c3adba87a..41a9a4306 100644 --- a/methods/server.h +++ b/methods/basehttp.h @@ -12,6 +12,7 @@ #define APT_SERVER_H #include <apt-pkg/strutl.h> +#include <apt-pkg/fileutl.h> #include "aptmethod.h" #include <time.h> @@ -23,53 +24,63 @@ using std::cout; using std::endl; class Hashes; -class ServerMethod; -class FileFd; +class BaseHttpMethod; +struct ServerState; -struct ServerState +struct RequestState { - // This is the last parsed Header Line - unsigned int Major; - unsigned int Minor; - unsigned int Result; + unsigned int Major = 0; + unsigned int Minor = 0; + unsigned int Result = 0; char Code[360]; - // These are some statistics from the last parsed header lines - // total size of the usable content (aka: the file) - unsigned long long TotalFileSize; + unsigned long long TotalFileSize = 0; // size we actually download (can be smaller than Size if we have partial content) - unsigned long long DownloadSize; + unsigned long long DownloadSize = 0; // size of junk content (aka: server error pages) - unsigned long long JunkSize; + unsigned long long JunkSize = 0; // The start of the data (for partial content) - unsigned long long StartPos; + unsigned long long StartPos = 0; + + unsigned long long MaximumSize = 0; time_t Date; - bool HaveContent; - enum {Chunked,Stream,Closes} Encoding; - enum {Header, Data} State; + bool HaveContent = false; + enum {Chunked,Stream,Closes} Encoding = Closes; + enum {Header, Data} State = Header; + std::string Location; + + FileFd File; + + BaseHttpMethod * const Owner; + ServerState * const Server; + + bool HeaderLine(std::string const &Line); + bool AddPartialFileToHashes(FileFd &File); + + RequestState(BaseHttpMethod * const Owner, ServerState * const Server) : + Owner(Owner), Server(Server) { time(&Date); } +}; + +struct ServerState +{ bool Persistent; bool PipelineAllowed; bool RangesAllowed; - std::string Location; - // This is a Persistent attribute of the server itself. bool Pipeline; URI ServerName; URI Proxy; unsigned long TimeOut; - unsigned long long MaximumSize; - protected: - ServerMethod *Owner; + BaseHttpMethod *Owner; virtual bool ReadHeaderLines(std::string &Data) = 0; - virtual bool LoadNextResponse(bool const ToFile, FileFd * const File) = 0; + virtual bool LoadNextResponse(bool const ToFile, RequestState &Req) = 0; public: - bool HeaderLine(std::string Line); /** \brief Result of the header acquire */ enum RunHeadersResult { @@ -81,38 +92,36 @@ struct ServerState RUN_HEADERS_PARSE_ERROR }; /** \brief Get the headers before the data */ - RunHeadersResult RunHeaders(FileFd * const File, const std::string &Uri); - bool AddPartialFileToHashes(FileFd &File); + RunHeadersResult RunHeaders(RequestState &Req, const std::string &Uri); bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;}; - virtual void Reset(bool const Everything = true); + virtual void Reset(); virtual bool WriteResponse(std::string const &Data) = 0; /** \brief Transfer the data from the socket */ - virtual bool RunData(FileFd * const File) = 0; - virtual bool RunDataToDevNull() = 0; + virtual bool RunData(RequestState &Req) = 0; + virtual bool RunDataToDevNull(RequestState &Req) = 0; virtual bool Open() = 0; virtual bool IsOpen() = 0; virtual bool Close() = 0; virtual bool InitHashes(HashStringList const &ExpectedHashes) = 0; - virtual Hashes * GetHashes() = 0; - virtual bool Die(FileFd * const File) = 0; + virtual bool Die(RequestState &Req) = 0; virtual bool Flush(FileFd * const File) = 0; - virtual bool Go(bool ToFile, FileFd * const File) = 0; + virtual bool Go(bool ToFile, RequestState &Req) = 0; + virtual Hashes * GetHashes() = 0; - ServerState(URI Srv, ServerMethod *Owner); + ServerState(URI Srv, BaseHttpMethod *Owner); virtual ~ServerState() {}; }; -class ServerMethod : public aptMethod +class BaseHttpMethod : public aptMethod { protected: virtual bool Fetch(FetchItem *) APT_OVERRIDE; std::unique_ptr<ServerState> Server; std::string NextURI; - FileFd *File; unsigned long PipelineDepth; bool AllowRedirect; @@ -140,7 +149,7 @@ class ServerMethod : public aptMethod TRY_AGAIN_OR_REDIRECT }; /** \brief Handle the retrieved header data */ - virtual DealWithHeadersResult DealWithHeaders(FetchResult &Res); + virtual DealWithHeadersResult DealWithHeaders(FetchResult &Res, RequestState &Req); // In the event of a fatal signal this file will be closed and timestamped. static std::string FailFile; @@ -148,8 +157,6 @@ class ServerMethod : public aptMethod static time_t FailTime; static APT_NORETURN void SigTerm(int); - virtual bool Flush() { return Server->Flush(File); }; - int Loop(); virtual void SendReq(FetchItem *Itm) = 0; @@ -159,8 +166,8 @@ class ServerMethod : public aptMethod bool AddProxyAuth(URI &Proxy, URI const &Server) const; - ServerMethod(std::string &&Binary, char const * const Ver,unsigned long const Flags); - virtual ~ServerMethod() {}; + BaseHttpMethod(std::string &&Binary, char const * const Ver,unsigned long const Flags); + virtual ~BaseHttpMethod() {}; }; #endif diff --git a/methods/connect.cc b/methods/connect.cc index f6fb14769..dc2aee05c 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -144,7 +144,9 @@ static bool DoConnect(struct addrinfo *Addr,std::string const &Host, return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(), Service,Name); } - + + Owner->SetFailReason(""); + return true; } /*}}}*/ @@ -312,12 +314,15 @@ bool Connect(std::string Host,int Port,const char *Service, size_t stackSize = 0; // try to connect in the priority order of the srv records std::string initialHost{std::move(Host)}; + auto const initialPort = Port; while(SrvRecords.empty() == false) { _error->PushToStack(); ++stackSize; // PopFromSrvRecs will also remove the server - Host = PopFromSrvRecs(SrvRecords).target; + auto Srv = PopFromSrvRecs(SrvRecords); + Host = Srv.target; + Port = Srv.port; auto const ret = ConnectToHostname(Host, Port, Service, DefPort, Fd, TimeOut, Owner); if (ret) { @@ -327,6 +332,7 @@ bool Connect(std::string Host,int Port,const char *Service, } } Host = std::move(initialHost); + Port = initialPort; // we have no (good) SrvRecords for this host, connect right away _error->PushToStack(); diff --git a/methods/ftp.cc b/methods/ftp.cc index dbc5f25d1..d789637a8 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -6,7 +6,7 @@ FTP Acquire Method - This is the FTP acquire method for APT. This is a very simple implementation that does not try to optimize - at all. Commands are sent syncronously with the FTP server (as the + at all. Commands are sent synchronously with the FTP server (as the rfc recommends, but it is not really necessary..) and no tricks are done to speed things along. @@ -974,7 +974,7 @@ FtpMethod::FtpMethod() : aptMethod("ftp","1.0",SendConfig) // FtpMethod::SigTerm - Handle a fatal signal /*{{{*/ // --------------------------------------------------------------------- /* This closes and timestamps the open file. This is necessary to get - resume behavoir on user abort */ + resume behavior on user abort */ void FtpMethod::SigTerm(int) { if (FailFd == -1) diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 95a86f890..51c268d02 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -120,7 +120,7 @@ static void PushEntryWithKeyID(std::vector<std::string> &Signers, char * const b // skip the message while (*p && !isspace(*p)) ++p; - // skip the seperator whitespace + // skip the separator whitespace ++p; // skip the hexdigit fingerprint while (*p && isxdigit(*p)) diff --git a/methods/http.cc b/methods/http.cc index 4703584cf..72e813cb9 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -174,32 +174,28 @@ void HttpMethod::RotateDNS() /*{{{*/ { } /*}}}*/ -ServerMethod::DealWithHeadersResult HttpMethod::DealWithHeaders(FetchResult &Res)/*{{{*/ +BaseHttpMethod::DealWithHeadersResult HttpMethod::DealWithHeaders(FetchResult &Res, RequestState &Req)/*{{{*/ { - auto ret = ServerMethod::DealWithHeaders(Res); - if (ret != ServerMethod::FILE_IS_OPEN) + auto ret = BaseHttpMethod::DealWithHeaders(Res, Req); + if (ret != BaseHttpMethod::FILE_IS_OPEN) return ret; - - // Open the file - delete File; - File = new FileFd(Queue->DestFile,FileFd::WriteAny); - if (_error->PendingError() == true) + if (Req.File.Open(Queue->DestFile, FileFd::WriteAny) == false) return ERROR_NOT_FROM_SERVER; FailFile = Queue->DestFile; FailFile.c_str(); // Make sure we don't do a malloc in the signal handler - FailFd = File->Fd(); - FailTime = Server->Date; + FailFd = Req.File.Fd(); + FailTime = Req.Date; - if (Server->InitHashes(Queue->ExpectedHashes) == false || Server->AddPartialFileToHashes(*File) == false) + if (Server->InitHashes(Queue->ExpectedHashes) == false || Req.AddPartialFileToHashes(Req.File) == false) { _error->Errno("read",_("Problem hashing file")); return ERROR_NOT_FROM_SERVER; } - if (Server->StartPos > 0) - Res.ResumePoint = Server->StartPos; + if (Req.StartPos > 0) + Res.ResumePoint = Req.StartPos; - SetNonBlock(File->Fd(),true); + SetNonBlock(Req.File.Fd(),true); return FILE_IS_OPEN; } @@ -554,7 +550,7 @@ int HttpMethod::Loop() return 0; } -HttpMethod::HttpMethod(std::string &&pProg) : ServerMethod(pProg.c_str(), "1.2", Pipeline | SendConfig)/*{{{*/ +HttpMethod::HttpMethod(std::string &&pProg) : BaseHttpMethod(pProg.c_str(), "1.2", Pipeline | SendConfig)/*{{{*/ { auto addName = std::inserter(methodNames, methodNames.begin()); if (Binary != "http") diff --git a/methods/http.h b/methods/http.h index 203ea9fd4..3b491dfda 100644 --- a/methods/http.h +++ b/methods/http.h @@ -17,7 +17,7 @@ #include <sys/time.h> #include <iostream> -#include "server.h" +#include "basehttp.h" using std::cout; using std::endl; @@ -26,17 +26,18 @@ class FileFd; class HttpMethod; class Hashes; -class HttpMethod : public ServerMethod +class HttpMethod : public BaseHttpMethod { public: virtual void SendReq(FetchItem *Itm) APT_OVERRIDE; virtual std::unique_ptr<ServerState> CreateServerState(URI const &uri) APT_OVERRIDE; virtual void RotateDNS() APT_OVERRIDE; - virtual DealWithHeadersResult DealWithHeaders(FetchResult &Res) APT_OVERRIDE; + virtual DealWithHeadersResult DealWithHeaders(FetchResult &Res, RequestState &Req) APT_OVERRIDE; protected: std::string AutoDetectProxyCmd; + FileFd *File; public: friend struct HttpServerState; diff --git a/methods/https.cc b/methods/https.cc index b2d05136c..d71ef0bf0 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -43,8 +43,9 @@ struct APT_HIDDEN CURLUserPointer { HttpsMethod * const https; HttpsMethod::FetchResult * const Res; HttpsMethod::FetchItem const * const Itm; + RequestState * const Req; CURLUserPointer(HttpsMethod * const https, HttpsMethod::FetchResult * const Res, - HttpsMethod::FetchItem const * const Itm) : https(https), Res(Res), Itm(Itm) {} + HttpsMethod::FetchItem const * const Itm, RequestState * const Req) : https(https), Res(Res), Itm(Itm), Req(Req) {} }; size_t @@ -63,55 +64,58 @@ HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp) if (line.empty() == true) { - me->https->Server->JunkSize = 0; - if (me->https->Server->Result != 416 && me->https->Server->StartPos != 0) + if (me->Req->File.Open(me->Itm->DestFile, FileFd::WriteAny) == false) + return ERROR_NOT_FROM_SERVER; + + me->Req->JunkSize = 0; + if (me->Req->Result != 416 && me->Req->StartPos != 0) ; - else if (me->https->Server->Result == 416) + else if (me->Req->Result == 416) { bool partialHit = false; if (me->Itm->ExpectedHashes.usable() == true) { Hashes resultHashes(me->Itm->ExpectedHashes); FileFd file(me->Itm->DestFile, FileFd::ReadOnly); - me->https->Server->TotalFileSize = file.FileSize(); - me->https->Server->Date = file.ModificationTime(); + me->Req->TotalFileSize = file.FileSize(); + me->Req->Date = file.ModificationTime(); resultHashes.AddFD(file); HashStringList const hashList = resultHashes.GetHashStringList(); partialHit = (me->Itm->ExpectedHashes == hashList); } - else if (me->https->Server->Result == 416 && me->https->Server->TotalFileSize == me->https->File->FileSize()) + else if (me->Req->Result == 416 && me->Req->TotalFileSize == me->Req->File.FileSize()) partialHit = true; if (partialHit == true) { - me->https->Server->Result = 200; - me->https->Server->StartPos = me->https->Server->TotalFileSize; + me->Req->Result = 200; + me->Req->StartPos = me->Req->TotalFileSize; // the actual size is not important for https as curl will deal with it // by itself and e.g. doesn't bother us with transport-encoding… - me->https->Server->JunkSize = std::numeric_limits<unsigned long long>::max(); + me->Req->JunkSize = std::numeric_limits<unsigned long long>::max(); } else - me->https->Server->StartPos = 0; + me->Req->StartPos = 0; } else - me->https->Server->StartPos = 0; + me->Req->StartPos = 0; - me->Res->LastModified = me->https->Server->Date; - me->Res->Size = me->https->Server->TotalFileSize; - me->Res->ResumePoint = me->https->Server->StartPos; + me->Res->LastModified = me->Req->Date; + me->Res->Size = me->Req->TotalFileSize; + me->Res->ResumePoint = me->Req->StartPos; // we expect valid data, so tell our caller we get the file now - if (me->https->Server->Result >= 200 && me->https->Server->Result < 300) + if (me->Req->Result >= 200 && me->Req->Result < 300) { if (me->Res->Size != 0 && me->Res->Size > me->Res->ResumePoint) me->https->URIStart(*me->Res); - if (me->https->Server->AddPartialFileToHashes(*(me->https->File)) == false) + if (me->Req->AddPartialFileToHashes(me->Req->File) == false) return 0; } else - me->https->Server->JunkSize = std::numeric_limits<decltype(me->https->Server->JunkSize)>::max(); + me->Req->JunkSize = std::numeric_limits<decltype(me->Req->JunkSize)>::max(); } - else if (me->https->Server->HeaderLine(line) == false) + else if (me->Req->HeaderLine(line) == false) return 0; return size*nmemb; @@ -120,29 +124,29 @@ HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp) size_t HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp) { - HttpsMethod *me = static_cast<HttpsMethod *>(userp); + CURLUserPointer *me = static_cast<CURLUserPointer *>(userp); size_t buffer_size = size * nmemb; // we don't need to count the junk here, just drop anything we get as // we don't always know how long it would be, e.g. in chunked encoding. - if (me->Server->JunkSize != 0) + if (me->Req->JunkSize != 0) return buffer_size; - if(me->File->Write(buffer, buffer_size) != true) + if(me->Req->File.Write(buffer, buffer_size) != true) return 0; - if(me->Queue->MaximumSize > 0) + if(me->https->Queue->MaximumSize > 0) { - unsigned long long const TotalWritten = me->File->Tell(); - if (TotalWritten > me->Queue->MaximumSize) + unsigned long long const TotalWritten = me->Req->File.Tell(); + if (TotalWritten > me->https->Queue->MaximumSize) { - me->SetFailReason("MaximumSizeExceeded"); + me->https->SetFailReason("MaximumSizeExceeded"); _error->Error("Writing more data than expected (%llu > %llu)", - TotalWritten, me->Queue->MaximumSize); + TotalWritten, me->https->Queue->MaximumSize); return 0; } } - if (me->Server->GetHashes()->Add((unsigned char const * const)buffer, buffer_size) == false) + if (me->https->Server->GetHashes()->Add((unsigned char const * const)buffer, buffer_size) == false) return 0; return buffer_size; @@ -268,15 +272,22 @@ bool HttpsMethod::Fetch(FetchItem *Itm) return _error->Error("Unsupported proxy configured: %s", URI::SiteOnly(Proxy).c_str()); maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc")); + if (Server == nullptr || Server->Comp(Itm->Uri) == false) + Server = CreateServerState(Itm->Uri); + + // The "+" is encoded as a workaround for a amazon S3 bug + // see LP bugs #1003633 and #1086997. (taken from http method) + Uri.Path = QuoteString(Uri.Path, "+~ "); FetchResult Res; - CURLUserPointer userp(this, &Res, Itm); + RequestState Req(this, Server.get()); + CURLUserPointer userp(this, &Res, Itm, &Req); // callbacks curl_easy_setopt(curl, CURLOPT_URL, static_cast<string>(Uri).c_str()); curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, parse_header); curl_easy_setopt(curl, CURLOPT_WRITEHEADER, &userp); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, this); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, &userp); // options curl_easy_setopt(curl, CURLOPT_NOPROGRESS, true); curl_easy_setopt(curl, CURLOPT_FILETIME, true); @@ -361,6 +372,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, DL_MIN_SPEED); curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, timeout); + if(_config->FindB("Acquire::ForceIPv4", false) == true) + curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); + else if(_config->FindB("Acquire::ForceIPv6", false) == true) + curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V6); + // debug if (Debug == true) curl_easy_setopt(curl, CURLOPT_VERBOSE, true); @@ -382,13 +398,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm) headers = curl_slist_append(headers, "Accept: text/*"); } - // go for it - if the file exists, append on it - File = new FileFd(Itm->DestFile, FileFd::WriteAny); - if (Server == nullptr || Server->Comp(Itm->Uri) == false) - Server = CreateServerState(Itm->Uri); - else - Server->Reset(false); - // if we have the file send an if-range query with a range header if (Server->RangesAllowed && stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0) { @@ -418,9 +427,9 @@ bool HttpsMethod::Fetch(FetchItem *Itm) long curl_condition_unmet = 0; curl_easy_getinfo(curl, CURLINFO_CONDITION_UNMET, &curl_condition_unmet); if (curl_condition_unmet == 1) - Server->Result = 304; + Req.Result = 304; - File->Close(); + Req.File.Close(); curl_slist_free_all(headers); // cleanup @@ -451,28 +460,28 @@ bool HttpsMethod::Fetch(FetchItem *Itm) return false; } - switch (DealWithHeaders(Res)) + switch (DealWithHeaders(Res, Req)) { - case ServerMethod::IMS_HIT: + case BaseHttpMethod::IMS_HIT: URIDone(Res); break; - case ServerMethod::ERROR_WITH_CONTENT_PAGE: + case BaseHttpMethod::ERROR_WITH_CONTENT_PAGE: // unlink, no need keep 401/404 page content in partial/ - RemoveFile(Binary.c_str(), File->Name()); - case ServerMethod::ERROR_UNRECOVERABLE: - case ServerMethod::ERROR_NOT_FROM_SERVER: + RemoveFile(Binary.c_str(), Req.File.Name()); + case BaseHttpMethod::ERROR_UNRECOVERABLE: + case BaseHttpMethod::ERROR_NOT_FROM_SERVER: return false; - case ServerMethod::TRY_AGAIN_OR_REDIRECT: + case BaseHttpMethod::TRY_AGAIN_OR_REDIRECT: Redirect(NextURI); break; - case ServerMethod::FILE_IS_OPEN: + case BaseHttpMethod::FILE_IS_OPEN: struct stat resultStat; - if (unlikely(stat(File->Name().c_str(), &resultStat) != 0)) + if (unlikely(stat(Req.File.Name().c_str(), &resultStat) != 0)) { - _error->Errno("stat", "Unable to access file %s", File->Name().c_str()); + _error->Errno("stat", "Unable to access file %s", Req.File.Name().c_str()); return false; } Res.Size = resultStat.st_size; @@ -485,7 +494,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) times[0].tv_sec = Res.LastModified; times[1].tv_sec = Res.LastModified; times[0].tv_usec = times[1].tv_usec = 0; - utimes(File->Name().c_str(), times); + utimes(Req.File.Name().c_str(), times); } else Res.LastModified = resultStat.st_mtime; @@ -497,8 +506,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm) URIDone(Res); break; } - - delete File; return true; } /*}}}*/ @@ -507,7 +514,7 @@ std::unique_ptr<ServerState> HttpsMethod::CreateServerState(URI const &uri)/*{{{ return std::unique_ptr<ServerState>(new HttpsServerState(uri, this)); } /*}}}*/ -HttpsMethod::HttpsMethod(std::string &&pProg) : ServerMethod(std::move(pProg),"1.2",Pipeline | SendConfig)/*{{{*/ +HttpsMethod::HttpsMethod(std::string &&pProg) : BaseHttpMethod(std::move(pProg),"1.2",Pipeline | SendConfig)/*{{{*/ { auto addName = std::inserter(methodNames, methodNames.begin()); addName = "http"; diff --git a/methods/https.h b/methods/https.h index 04e72e815..fbbf34501 100644 --- a/methods/https.h +++ b/methods/https.h @@ -17,7 +17,7 @@ #include <string> #include <memory> -#include "server.h" +#include "basehttp.h" using std::cout; using std::endl; @@ -32,29 +32,29 @@ class HttpsServerState : public ServerState protected: virtual bool ReadHeaderLines(std::string &/*Data*/) APT_OVERRIDE { return false; } - virtual bool LoadNextResponse(bool const /*ToFile*/, FileFd * const /*File*/) APT_OVERRIDE { return false; } + virtual bool LoadNextResponse(bool const /*ToFile*/, RequestState &/*Req*/) APT_OVERRIDE { return false; } public: virtual bool WriteResponse(std::string const &/*Data*/) APT_OVERRIDE { return false; } /** \brief Transfer the data from the socket */ - virtual bool RunData(FileFd * const /*File*/) APT_OVERRIDE { return false; } - virtual bool RunDataToDevNull() APT_OVERRIDE { return false; } + virtual bool RunData(RequestState &) APT_OVERRIDE { return false; } + virtual bool RunDataToDevNull(RequestState &) APT_OVERRIDE { return false; } virtual bool Open() APT_OVERRIDE { return false; } virtual bool IsOpen() APT_OVERRIDE { return false; } virtual bool Close() APT_OVERRIDE { return false; } virtual bool InitHashes(HashStringList const &ExpectedHashes) APT_OVERRIDE; virtual Hashes * GetHashes() APT_OVERRIDE; - virtual bool Die(FileFd * const /*File*/) APT_OVERRIDE { return false; } + virtual bool Die(RequestState &/*Req*/) APT_OVERRIDE { return false; } virtual bool Flush(FileFd * const /*File*/) APT_OVERRIDE { return false; } - virtual bool Go(bool /*ToFile*/, FileFd * const /*File*/) APT_OVERRIDE { return false; } + virtual bool Go(bool /*ToFile*/, RequestState &/*Req*/) APT_OVERRIDE { return false; } HttpsServerState(URI Srv, HttpsMethod *Owner); virtual ~HttpsServerState() {Close();}; }; -class HttpsMethod : public ServerMethod +class HttpsMethod : public BaseHttpMethod { // minimum speed in bytes/se that triggers download timeout handling static const int DL_MIN_SPEED = 10; @@ -68,7 +68,7 @@ class HttpsMethod : public ServerMethod bool SetupProxy(); CURL *curl; - // Used by ServerMethods unused by https + // Used by BaseHttpMethods unused by https virtual void SendReq(FetchItem *) APT_OVERRIDE { exit(42); } virtual void RotateDNS() APT_OVERRIDE { exit(42); } diff --git a/methods/rred.cc b/methods/rred.cc index 958933a07..2e5008d46 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -662,12 +662,14 @@ class RredMethod : public aptMethod { FileFd inp, out; if (inp.Open(Path, FileFd::ReadOnly, FileFd::Extension) == false) { - std::cerr << "FAILED to open inp " << Path << std::endl; + if (Debug == true) + std::clog << "FAILED to open inp " << Path << std::endl; return _error->Error("Failed to open inp %s", Path.c_str()); } if (out.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Empty | FileFd::BufferedWrite, FileFd::Extension) == false) { - std::cerr << "FAILED to open out " << Itm->DestFile << std::endl; + if (Debug == true) + std::clog << "FAILED to open out " << Itm->DestFile << std::endl; return _error->Error("Failed to open out %s", Itm->DestFile.c_str()); } @@ -686,7 +688,8 @@ class RredMethod : public aptMethod { inp.Close(); if (_error->PendingError() == true) { - std::cerr << "FAILED to read or write files" << std::endl; + if (Debug == true) + std::clog << "FAILED to read or write files" << std::endl; return false; } diff --git a/po/apt-all.pot b/po/apt-all.pot index b7e9efc23..131b2d629 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 1.4~beta1\n" +"Project-Id-Version: apt 1.4.8\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -400,8 +400,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1576,12 +1576,14 @@ msgstr "" msgid " Done" msgstr "" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "" -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." msgstr "" #: apt-private/private-cacheset.cc apt-private/private-search.cc @@ -1757,6 +1759,12 @@ msgid "Broken packages" msgstr "" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" @@ -1851,12 +1859,6 @@ msgid "Download complete and in download only mode" msgstr "" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "" @@ -1921,16 +1923,6 @@ msgstr[0] "" msgstr[1] "" #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" - -#: apt-private/private-install.cc msgid "The following additional packages will be installed:" msgstr "" @@ -2303,7 +2295,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" @@ -3164,6 +3155,53 @@ msgstr "" msgid " %s has no binary override entry either\n" msgstr "" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3509,53 +3547,6 @@ msgstr "" msgid "Connection closed prematurely" msgstr "" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "" - -#: methods/server.cc -msgid "Bad header line" -msgstr "" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "" - -#: methods/server.cc -msgid "Bad header data" -msgstr "" - -#: methods/server.cc -msgid "Connection failed" -msgstr "" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -406,8 +406,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1591,13 +1591,17 @@ msgstr "لم Ùمكن تقلÙص مجموعة الترقÙØ©" msgid " Done" msgstr " تم" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "قد ترغب بتنÙÙØ° الأمر 'apt-get -f install' لتصØÙØ Ù‡Ø°Ù‡." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "قد ترغب بتنÙÙØ° الأمر 'apt --fix-broken install' لتصØÙØ Ù‡Ø°Ù‡." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Ù…Ùعتمدات غÙر مستوÙاة. Øاول استخدام -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Ù…Ùعتمدات غÙر مستوÙاة. جرب 'apt --fix-broken install' بدون أسماء Øزم (أو Øدّد " +"Øلاً)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1774,6 +1778,14 @@ msgid "Broken packages" msgstr "Øزم معطوبة" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"تعذر Ø¥Øضار بعض الأرشÙÙØŒ ربما Ùمكنك Ù…Øاولة تنÙÙØ° apt-get update أو إضاÙØ© --" +"fix-missingØŸ" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "خطأ داخلÙØŒ تم طلب InstallPackages مع وجود Øزم معطوبة!" @@ -1873,14 +1885,6 @@ msgid "Download complete and in download only mode" msgstr "اكتمل التنزÙÙ„ ÙˆÙ٠وضع التنزÙÙ„ Ùقط" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"تعذر Ø¥Øضار بعض الأرشÙÙØŒ ربما Ùمكنك Ù…Øاولة تنÙÙØ° apt-get update أو إضاÙØ© --" -"fix-missingØŸ" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing وتبدÙÙ„ الأوساط غÙر مدعومة ØالÙاً" @@ -1947,17 +1951,6 @@ msgstr[0] "" msgstr[1] "" #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "قد ترغب بتشغÙÙ„ 'apt-get -f install' لتصØÙØ Ù‡Ø°Ù‡:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Ù…Ùعتمدات غÙر مستوÙاة. جرب 'apt-get -f install' بدون أسماء Øزم (أو Øدّد Øلاً)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "سÙتم تثبÙت الØزم الإضاÙÙّة التالÙØ©:" @@ -2337,7 +2330,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "أمر ÙÙƒ الØزمة '%s' Ùشل.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" @@ -3222,6 +3214,53 @@ msgstr "" msgid " %s has no binary override entry either\n" msgstr "" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "بانتظار التروÙسات" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "أرسل خادم http تروÙسة ردّ غÙر صالØØ©" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "سطر تروÙسة سÙØ¡" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "أرسل خادم http تروÙسة طول Ù…ØتوÙات (ÙContent-Length) غÙر صالØØ©" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "أرسل خادم http تروÙسة مدى Ù…ØتوÙات (ÙContent-Range) غÙر صالØØ©" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "خادم http له دعم مدى معطوب" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "نسق تارÙØ® مجهول" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "بÙانات تروÙسة سÙئة" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Ùشل الاتصال" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "خطأ داخلÙ" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3571,57 +3610,16 @@ msgstr "Ùشل تعÙÙÙ† وقت التعدÙÙ„" msgid "Connection closed prematurely" msgstr "" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "بانتظار التروÙسات" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "أرسل خادم http تروÙسة ردّ غÙر صالØØ©" - -#: methods/server.cc -msgid "Bad header line" -msgstr "سطر تروÙسة سÙØ¡" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "أرسل خادم http تروÙسة طول Ù…ØتوÙات (ÙContent-Length) غÙر صالØØ©" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "أرسل خادم http تروÙسة مدى Ù…ØتوÙات (ÙContent-Range) غÙر صالØØ©" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "خادم http له دعم مدى معطوب" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "نسق تارÙØ® مجهول" - -#: methods/server.cc -msgid "Bad header data" -msgstr "بÙانات تروÙسة سÙئة" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Ùشل الاتصال" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "خطأ داخلÙ" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "Ù…Ùعتمدات غÙر مستوÙاة. Øاول استخدام --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "قد ترغب بتشغÙÙ„ 'apt --fix-broken install' لتصØÙØ Ù‡Ø°Ù‡:" + #~ msgid "(not found)" #~ msgstr "(غÙر موجود)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -407,8 +407,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1640,13 +1640,17 @@ msgstr "Nun pue amenorgase'l conxuntu d'actualizaciĂ³n" msgid " Done" msgstr " Fecho" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "HabrĂes d'executar 'apt-get -f install' para igualo." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "HabrĂes d'executar 'apt --fix-broken install' para igualo." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Dependencies incumplĂes. TĂ©ntalo usando -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Dependencies ensin cubrir. Tenta 'apt --fix-broken install' ensin paquetes " +"(o conseña una soluciĂ³n)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1830,6 +1834,14 @@ msgid "Broken packages" msgstr "Paquetes frañaos" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Nun pudieron algamase dellos archivos, ¿seique executando apt-get update o " +"tentando --fix-missing?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!" @@ -1930,14 +1942,6 @@ msgid "Download complete and in download only mode" msgstr "Descarga completa y en mou de sĂ³lo descarga" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Nun pudieron algamase dellos archivos, ¿seique executando apt-get update o " -"tentando --fix-missing?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing y cambĂ©u de mediu nun ta sofitao actualmente" @@ -2011,18 +2015,6 @@ msgstr[0] "Usa '%s' pa desinstalalos." msgstr[1] "Usa '%s' pa desinstalalos." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "HabrĂes d'executar 'apt-get -f install' para iguar estos:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o " -"conseña una soluciĂ³n)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "InstalarĂ¡nse los siguientes paquetes extra:" @@ -2413,7 +2405,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "FallĂ³ la orde de desempaquetĂ¡u '%s'.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instalĂ¡u.\n" @@ -3384,6 +3375,53 @@ msgstr " %s nun tien la entrada saltos de fonte\n" msgid " %s has no binary override entry either\n" msgstr " %s tampoco nun tiene una entrada binaria de saltos\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Esperando les testeres" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "El sirvidor HTTP mandĂ³ una testera incorreuta de rempuesta" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Fallu na llinia testera" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "El sirvidor HTTP mandĂ³ una testera incorreuta de Content-Length" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "El sirvidor HTTP mandĂ³ una testera incorreuta de Content-Range" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Formatu de data desconocĂu" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Datos de testera incorreutos" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Fallo la conexĂ³n" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Fallu internu" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3737,57 +3775,16 @@ msgstr "Nun se pudo afitar la hora de modificaciĂ³n" msgid "Connection closed prematurely" msgstr "ConexĂ³n encaboxada prematuramente" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Esperando les testeres" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "El sirvidor HTTP mandĂ³ una testera incorreuta de rempuesta" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Fallu na llinia testera" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "El sirvidor HTTP mandĂ³ una testera incorreuta de Content-Length" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "El sirvidor HTTP mandĂ³ una testera incorreuta de Content-Range" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Formatu de data desconocĂu" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Datos de testera incorreutos" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Fallo la conexĂ³n" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Fallu internu" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "Dependencies incumplĂes. TĂ©ntalo usando --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "HabrĂes d'executar 'apt --fix-broken install' para iguar estos:" + #~ msgid "(not found)" #~ msgstr "(nun s'alcontrĂ³)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -416,8 +416,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1671,15 +1671,19 @@ msgstr "ĐĐµÑƒÑĐ¿ĐµÑ… Đ¿Ñ€Đ¸ Đ¼Đ¸Đ½Đ¸Đ¼Đ¸Đ·Đ¸Ñ€Đ°Đ½ĐµÑ‚Đ¾ Đ½Đ° Đ½Đ°Đ±Đ¾Ñ€Đ° Đ°Đ msgid " Done" msgstr " Đ“Đ¾Ñ‚Đ¾Đ²Đ¾" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "" -"Đ’ÑĐ·Đ¼Đ¾Đ¶Đ½Đ¾ е Đ´Đ° Đ¸Đ·Đ¿ÑĐ»Đ½Đ¸Ñ‚Đµ â€apt-get -f install“, Đ·Đ° Đ´Đ° ĐºĐ¾Ñ€Đ¸Đ³Đ¸Ñ€Đ°Ñ‚Đµ Ñ‚ĐµĐ·Đ¸ " +"Đ’ÑĐ·Đ¼Đ¾Đ¶Đ½Đ¾ е Đ´Đ° Đ¸Đ·Đ¿ÑĐ»Đ½Đ¸Ñ‚Đµ â€apt --fix-broken install“, Đ·Đ° Đ´Đ° ĐºĐ¾Ñ€Đ¸Đ³Đ¸Ñ€Đ°Ñ‚Đµ Ñ‚ĐµĐ·Đ¸ " "Đ½ĐµĐ¸Đ·Đ¿Ñ€Đ°Đ²Đ½Đ¾ÑÑ‚Đ¸." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "ĐĐµÑƒĐ´Đ¾Đ²Đ»ĐµÑ‚Đ²Đ¾Ñ€ĐµĐ½Đ¸ Đ·Đ°Đ²Đ¸ÑĐ¸Đ¼Đ¾ÑÑ‚Đ¸. ĐĐ¿Đ¸Ñ‚Đ°Đ¹Ñ‚Đµ Ñ â€-f“." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"ĐĐµÑƒĐ´Đ¾Đ²Đ»ĐµÑ‚Đ²Đ¾Ñ€ĐµĐ½Đ¸ Đ·Đ°Đ²Đ¸ÑĐ¸Đ¼Đ¾ÑÑ‚Đ¸. ĐĐ¿Đ¸Ñ‚Đ°Đ¹Ñ‚Đµ â€apt --fix-broken install“ без Đ¿Đ°ĐºĐµÑ‚Đ¸ " +"(или ÑƒĐºĐ°Đ¶ĐµÑ‚Đµ Ñ€Đ°Đ·Ñ€ĐµÑˆĐµĐ½Đ¸Đµ)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1866,6 +1870,14 @@ msgid "Broken packages" msgstr "Đ¡Ñ‡ÑƒĐ¿ĐµĐ½Đ¸ Đ¿Đ°ĐºĐµÑ‚Đ¸" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"ĐĐµÑƒÑĐ¿ĐµÑ… Đ¿Ñ€Đ¸ Đ¸Đ·Ñ‚ĐµĐ³Đ»ÑĐ½ĐµÑ‚Đ¾ Đ½Đ° Đ½ÑĐºĐ¾Đ¸ Đ°Ñ€Ñ…Đ¸Đ²Đ¸, Đ¼Đ¾Đ¶Đµ Đ´Đ° Đ¸Đ·Đ¿ÑĐ»Đ½Đ¸Ñ‚Đµ â€apt-get update“ " +"или Đ´Đ° Đ¾Đ¿Đ¸Ñ‚Đ°Ñ‚Đµ Ñ â€--fix-missing“?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Đ’ÑÑ‚Ñ€ĐµÑˆĐ½Đ° Đ³Ñ€ĐµÑˆĐºĐ°, â€InstallPackages“ е Đ¿Ñ€ĐµĐ´Đ¸Đ·Đ²Đ¸ĐºĐ°Đ½Đ¾ Đ¿Ñ€Đ¸ ÑÑ‡ÑƒĐ¿ĐµĐ½Đ¸ Đ¿Đ°ĐºĐµÑ‚Đ¸!" @@ -1968,14 +1980,6 @@ msgid "Download complete and in download only mode" msgstr "Đ˜Đ·Ñ‚ĐµĐ³Đ»ÑĐ½ĐµÑ‚Đ¾ Đ·Đ°Đ²ÑÑ€ÑˆĐ¸ Đ² Ñ€ĐµĐ¶Đ¸Đ¼ ÑĐ°Đ¼Đ¾ Đ½Đ° Đ¸Đ·Ñ‚ĐµĐ³Đ»ÑĐ½Đµ" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"ĐĐµÑƒÑĐ¿ĐµÑ… Đ¿Ñ€Đ¸ Đ¸Đ·Ñ‚ĐµĐ³Đ»ÑĐ½ĐµÑ‚Đ¾ Đ½Đ° Đ½ÑĐºĐ¾Đ¸ Đ°Ñ€Ñ…Đ¸Đ²Đ¸, Đ¼Đ¾Đ¶Đµ Đ´Đ° Đ¸Đ·Đ¿ÑĐ»Đ½Đ¸Ñ‚Đµ â€apt-get update“ " -"или Đ´Đ° Đ¾Đ¿Đ¸Ñ‚Đ°Ñ‚Đµ Ñ â€--fix-missing“?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "â€--fix-missing“ и Đ¿Ñ€ĐµĐ²ĐºĐ»ÑÑ‡Đ²Đ°Đ½Đµ Đ½Đ° Đ½Đ¾ÑĐ¸Ñ‚ĐµĐ»Đ¸ Đ½Đµ Ñе Đ¿Đ¾Đ´Đ´ÑÑ€Đ¶Đ° Đ²Ñе Đ¾Ñ‰Đµ" @@ -2048,18 +2052,6 @@ msgstr[0] "Đ˜Đ·Đ¿Đ¾Đ»Đ·Đ²Đ°Đ¹Ñ‚Đµ â€%s“ Đ·Đ° Đ´Đ° Đ³Đ¾ Đ¿Ñ€ĐµĐ¼Đ°Ñ…Đ½ĐµÑ‚Đµ." msgstr[1] "Đ˜Đ·Đ¿Đ¾Đ»Đ·Đ²Đ°Đ¹Ñ‚Đµ â€%s“ Đ·Đ° Đ´Đ° Đ³Đ¸ Đ¿Ñ€ĐµĐ¼Đ°Ñ…Đ½ĐµÑ‚Đµ." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Đ’ÑĐ·Đ¼Đ¾Đ¶Đ½Đ¾ е Đ´Đ° Đ¸Đ·Đ¿ÑĐ»Đ½Đ¸Ñ‚Đµ â€apt-get -f install“, Đ·Đ° Đ´Đ° ĐºĐ¾Ñ€Đ¸Đ³Đ¸Ñ€Đ°Ñ‚Đµ:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"ĐĐµÑƒĐ´Đ¾Đ²Đ»ĐµÑ‚Đ²Đ¾Ñ€ĐµĐ½Đ¸ Đ·Đ°Đ²Đ¸ÑĐ¸Đ¼Đ¾ÑÑ‚Đ¸. ĐĐ¿Đ¸Ñ‚Đ°Đ¹Ñ‚Đµ â€apt-get -f install“ без Đ¿Đ°ĐºĐµÑ‚Đ¸ (или " -"ÑƒĐºĐ°Đ¶ĐµÑ‚Đµ Ñ€Đ°Đ·Ñ€ĐµÑˆĐµĐ½Đ¸Đµ)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Đ¡Đ»ĐµĐ´Đ½Đ¸Ñ‚Đµ Đ´Đ¾Đ¿ÑĐ»Đ½Đ¸Ñ‚ĐµĐ»Đ½Đ¸ Đ¿Đ°ĐºĐµÑ‚Đ¸ Ñ‰Đµ бÑĐ´Đ°Ñ‚ Đ¸Đ½ÑÑ‚Đ°Đ»Đ¸Ñ€Đ°Đ½Đ¸:" @@ -2452,7 +2444,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "ĐĐ¾Đ¼Đ°Đ½Đ´Đ°Ñ‚Đ° Đ·Đ° Ñ€Đ°Đ·Đ¿Đ°ĐºĐµÑ‚Đ¸Ñ€Đ°Đ½Đµ â€%s“ Đ¿Ñ€Đ¾Đ¿Đ°Đ´Đ½Đ°.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ĐŸÑ€Đ¾Đ²ĐµÑ€ĐµÑ‚Đµ дали Đ¸Đ¼Đ°Ñ‚Đµ Đ¸Đ½ÑÑ‚Đ°Đ»Đ¸Ñ€Đ°Đ½ Đ¿Đ°ĐºĐµÑ‚Đ° â€dpkg-dev“.\n" @@ -3429,6 +3420,53 @@ msgstr " %s Đ½ÑĐ¼Đ° Đ·Đ°Đ¿Đ¸Ñ â€source override“\n" msgid " %s has no binary override entry either\n" msgstr " %s Đ½ÑĐ¼Đ° ÑÑÑ‰Đ¾ и Đ·Đ°Đ¿Đ¸Ñ â€binary override“\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Đ§Đ°ĐºĐ°Đ½Đµ Đ½Đ° Đ·Đ°Đ³Đ»Đ°Đ²Đ½Đ¸ Ñ‡Đ°ÑÑ‚Đ¸" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP ÑÑÑ€Đ²ÑÑ€ÑÑ‚ Đ¸Đ·Đ¿Ñ€Đ°Ñ‚Đ¸ Đ½ĐµĐ²Đ°Đ»Đ¸Đ´Đ½Đ° Đ·Đ°Đ³Đ»Đ°Đ²Đ½Đ° Ñ‡Đ°ÑÑ‚ ĐºĐ°Ñ‚Đ¾ Đ¾Ñ‚Đ³Đ¾Đ²Đ¾Ñ€" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "ĐĐµĐ²Đ°Đ»Đ¸Đ´ĐµĐ½ Ñ€ĐµĐ´ Đ½Đ° Đ·Đ°Đ³Đ»Đ°Đ²Đ½Đ° Ñ‡Đ°ÑÑ‚" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP ÑÑÑ€Đ²ÑÑ€ÑÑ‚ Đ¸Đ·Đ¿Ñ€Đ°Ñ‚Đ¸ Đ½ĐµĐ²Đ°Đ»Đ¸Đ´Đ½Đ° Đ·Đ°Đ³Đ»Đ°Đ²Đ½Đ° Ñ‡Đ°ÑÑ‚ â€Content-Length“" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP ÑÑÑ€Đ²ÑÑ€ÑÑ‚ Đ¸Đ·Đ¿Ñ€Đ°Ñ‚Đ¸ Đ½ĐµĐ²Đ°Đ»Đ¸Đ´Đ½Đ° Đ·Đ°Đ³Đ»Đ°Đ²Đ½Đ° Ñ‡Đ°ÑÑ‚ â€Content-Range“" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "HTTP ÑÑÑ€Đ²ÑÑ€ÑÑ‚ Đ½ÑĐ¼Đ° Đ¿Đ¾Đ´Đ´Ñ€ÑĐ¶ĐºĐ° Đ·Đ° Đ¿Ñ€ĐµÑ…Đ²ÑÑ€Đ»ÑĐ½Đµ Đ½Đ° Ñ„Ñ€Đ°Đ³Đ¼ĐµĐ½Ñ‚Đ¸ Đ½Đ° Ñ„Đ°Đ¹Đ»Đ¾Đ²Đµ" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "ĐĐµĐ¸Đ·Đ²ĐµÑÑ‚ĐµĐ½ Ñ„Đ¾Ñ€Đ¼Đ°Ñ‚ Đ½Đ° Đ´Đ°Ñ‚Đ°" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "ĐĐµĐ²Đ°Đ»Đ¸Đ´Đ½Đ¸ Đ´Đ°Đ½Đ½Đ¸ Đ½Đ° Đ·Đ°Đ³Đ»Đ°Đ²Đ½Đ°Ñ‚Đ° Ñ‡Đ°ÑÑ‚" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "ĐĐµÑƒÑĐ¿ĐµÑ… Đ¿Ñ€Đ¸ ÑĐ²ÑÑ€Đ·Đ²Đ°Đ½ĐµÑ‚Đ¾" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Đ’ÑÑ‚Ñ€ĐµÑˆĐ½Đ° Đ³Ñ€ĐµÑˆĐºĐ°" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3786,57 +3824,17 @@ msgstr "ĐĐµÑƒÑĐ¿ĐµÑ… Đ¿Ñ€Đ¸ Đ·Đ°Đ´Đ°Đ²Đ°Đ½ĐµÑ‚Đ¾ Đ½Đ° Đ²Ñ€ĐµĐ¼Đµ Đ½Đ° Đ¿Ñ€Đ¾Đ¼ msgid "Connection closed prematurely" msgstr "Đ’Ñ€ÑĐ·ĐºĐ°Ñ‚Đ° Đ¿Ñ€ĐµĐºÑÑĐ½Đ° Đ¿Ñ€ĐµĐ¶Đ´ĐµĐ²Ñ€ĐµĐ¼ĐµĐ½Đ½Đ¾" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Đ§Đ°ĐºĐ°Đ½Đµ Đ½Đ° Đ·Đ°Đ³Đ»Đ°Đ²Đ½Đ¸ Ñ‡Đ°ÑÑ‚Đ¸" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "HTTP ÑÑÑ€Đ²ÑÑ€ÑÑ‚ Đ¸Đ·Đ¿Ñ€Đ°Ñ‚Đ¸ Đ½ĐµĐ²Đ°Đ»Đ¸Đ´Đ½Đ° Đ·Đ°Đ³Đ»Đ°Đ²Đ½Đ° Ñ‡Đ°ÑÑ‚ ĐºĐ°Ñ‚Đ¾ Đ¾Ñ‚Đ³Đ¾Đ²Đ¾Ñ€" - -#: methods/server.cc -msgid "Bad header line" -msgstr "ĐĐµĐ²Đ°Đ»Đ¸Đ´ĐµĐ½ Ñ€ĐµĐ´ Đ½Đ° Đ·Đ°Đ³Đ»Đ°Đ²Đ½Đ° Ñ‡Đ°ÑÑ‚" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "HTTP ÑÑÑ€Đ²ÑÑ€ÑÑ‚ Đ¸Đ·Đ¿Ñ€Đ°Ñ‚Đ¸ Đ½ĐµĐ²Đ°Đ»Đ¸Đ´Đ½Đ° Đ·Đ°Đ³Đ»Đ°Đ²Đ½Đ° Ñ‡Đ°ÑÑ‚ â€Content-Length“" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "HTTP ÑÑÑ€Đ²ÑÑ€ÑÑ‚ Đ¸Đ·Đ¿Ñ€Đ°Ñ‚Đ¸ Đ½ĐµĐ²Đ°Đ»Đ¸Đ´Đ½Đ° Đ·Đ°Đ³Đ»Đ°Đ²Đ½Đ° Ñ‡Đ°ÑÑ‚ â€Content-Range“" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "HTTP ÑÑÑ€Đ²ÑÑ€ÑÑ‚ Đ½ÑĐ¼Đ° Đ¿Đ¾Đ´Đ´Ñ€ÑĐ¶ĐºĐ° Đ·Đ° Đ¿Ñ€ĐµÑ…Đ²ÑÑ€Đ»ÑĐ½Đµ Đ½Đ° Ñ„Ñ€Đ°Đ³Đ¼ĐµĐ½Ñ‚Đ¸ Đ½Đ° Ñ„Đ°Đ¹Đ»Đ¾Đ²Đµ" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "ĐĐµĐ¸Đ·Đ²ĐµÑÑ‚ĐµĐ½ Ñ„Đ¾Ñ€Đ¼Đ°Ñ‚ Đ½Đ° Đ´Đ°Ñ‚Đ°" - -#: methods/server.cc -msgid "Bad header data" -msgstr "ĐĐµĐ²Đ°Đ»Đ¸Đ´Đ½Đ¸ Đ´Đ°Đ½Đ½Đ¸ Đ½Đ° Đ·Đ°Đ³Đ»Đ°Đ²Đ½Đ°Ñ‚Đ° Ñ‡Đ°ÑÑ‚" - -#: methods/server.cc -msgid "Connection failed" -msgstr "ĐĐµÑƒÑĐ¿ĐµÑ… Đ¿Ñ€Đ¸ ÑĐ²ÑÑ€Đ·Đ²Đ°Đ½ĐµÑ‚Đ¾" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Đ’ÑÑ‚Ñ€ĐµÑˆĐ½Đ° Đ³Ñ€ĐµÑˆĐºĐ°" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "ĐŸÑ€Đ°Đ·Đ½Đ¸ Ñ„Đ°Đ¹Đ»Đ¾Đ²Đµ Đ½Đµ Đ¼Đ¾Đ³Đ°Ñ‚ Đ´Đ° бÑĐ´Đ°Ñ‚ Đ²Đ°Đ»Đ¸Đ´Đ½Đ¸ Đ°Ñ€Ñ…Đ¸Đ²Đ¸" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "ĐĐµÑƒĐ´Đ¾Đ²Đ»ĐµÑ‚Đ²Đ¾Ñ€ĐµĐ½Đ¸ Đ·Đ°Đ²Đ¸ÑĐ¸Đ¼Đ¾ÑÑ‚Đ¸. ĐĐ¿Đ¸Ñ‚Đ°Đ¹Ñ‚Đµ Ñ â€--fix-broken“." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "Đ’ÑĐ·Đ¼Đ¾Đ¶Đ½Đ¾ е Đ´Đ° Đ¸Đ·Đ¿ÑĐ»Đ½Đ¸Ñ‚Đµ â€apt --fix-broken install“, Đ·Đ° Đ´Đ° ĐºĐ¾Ñ€Đ¸Đ³Đ¸Ñ€Đ°Ñ‚Đµ:" + #~ msgid "(not found)" #~ msgstr "(Đ½Đµ ÑĐ° Đ½Đ°Đ¼ĐµÑ€ĐµĐ½Đ¸)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -402,8 +402,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1586,13 +1586,15 @@ msgstr "" msgid " Done" msgstr " UraÄ‘eno" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "" -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Nezadovoljene zavisnosti. PokuÅ¡ajte koristeći -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1770,6 +1772,12 @@ msgid "Broken packages" msgstr "OÅ¡tećeni paketi" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" @@ -1864,12 +1872,6 @@ msgid "Download complete and in download only mode" msgstr "" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "" @@ -1935,16 +1937,6 @@ msgstr[0] "" msgstr[1] "" #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" @@ -2322,7 +2314,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" @@ -3205,6 +3196,53 @@ msgstr "" msgid " %s has no binary override entry either\n" msgstr "" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "ÄŒekam na zaglavlja" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Nepoznat oblik datuma" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Povezivanje neuspjeÅ¡no" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "UnutraÅ¡nja greÅ¡ka" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3554,57 +3592,13 @@ msgstr "" msgid "Connection closed prematurely" msgstr "" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "ÄŒekam na zaglavlja" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "" - -#: methods/server.cc -msgid "Bad header line" -msgstr "" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Nepoznat oblik datuma" - -#: methods/server.cc -msgid "Bad header data" -msgstr "" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Povezivanje neuspjeÅ¡no" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "UnutraÅ¡nja greÅ¡ka" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "Nezadovoljene zavisnosti. PokuÅ¡ajte koristeći --fix-broken." + #~ msgid "" #~ "Options:\n" #~ " -h This help text.\n" @@ -4,19 +4,21 @@ # Matt Bonner <mateubonet@yahoo.com>, 2003. # Jordi Mallach <jordi@debian.org>, 2004, 2005, 2006, 2008, 2009, 2011, 2012. # AgustĂ Grau <fletxa@gmail.com>, 2010. +# Oriol Debian <oriol.debian@gmail.com>, 2016. msgid "" msgstr "" -"Project-Id-Version: apt 0.9.7.6\n" +"Project-Id-Version: apt 1.4~beta1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-11-25 23:46+0100\n" -"PO-Revision-Date: 2012-10-19 13:30+0200\n" -"Last-Translator: Jordi Mallach <jordi@debian.org>\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 2.0\n" #: apt-inst/contrib/arfile.cc msgid "Invalid archive signature" @@ -44,9 +46,9 @@ msgid "Failed to read the archive headers" msgstr "Ha fallat la lectura de les capçaleres de l'arxiu" #: apt-inst/contrib/extracttar.cc -#, fuzzy, c-format +#, c-format msgid "Cannot find a configured compressor for '%s'" -msgstr "No s'ha pogut trobar el registre d'autenticatiĂ³ per a: %s" +msgstr "No s'ha pogut trobar cap compressor configurat per: «%s»" #: apt-inst/contrib/extracttar.cc msgid "Corrupted archive" @@ -163,7 +165,7 @@ msgstr "DropNode crida a un node que encara estĂ enllaçat" #: apt-inst/filelist.cc msgid "Failed to locate the hash element!" -msgstr "No s'ha trobat l'element diseminat!" +msgstr "No s'ha trobat l'element disseminat!" #: apt-inst/filelist.cc msgid "Failed to allocate diversion" @@ -193,49 +195,57 @@ msgid "" "Updating from such a repository can't be done securely, and is therefore " "disabled by default." msgstr "" +"No es pot actualitzar d'un repositori com aquest de forma segura i per tant " +"estĂ desactivat per omissiĂ³." #: apt-pkg/acquire-item.cc msgid "" "Data from such a repository can't be authenticated and is therefore " "potentially dangerous to use." msgstr "" +"Les dades d'un repositori com aquest no es poden autenticar i per tant el " +"seu Ăºs Ă©s potencialment perillĂ³s." #: apt-pkg/acquire-item.cc msgid "" "See apt-secure(8) manpage for repository creation and user configuration " "details." msgstr "" +"Miri la pĂ gina de manual apt-secure(8) per veure els detalls sobre la " +"creaciĂ³ de repositoris i la configuraciĂ³ d'usuaris." #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "The repository '%s' is no longer signed." -msgstr "El directori %s estĂ desviat" +msgstr "El directori «%s» ja no estĂ signat." #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "The repository '%s' does no longer have a Release file." -msgstr "El directori %s estĂ desviat" +msgstr "El directori «%s» ja no tĂ© fitxer de publicaciĂ³ «Release»." #: apt-pkg/acquire-item.cc msgid "" "This is normally not allowed, but the option Acquire::" "AllowDowngradeToInsecureRepositories was given to override it." msgstr "" +"Normalment no estĂ permès, perĂ² s'ha donat l'opciĂ³ «Acquire::" +"AllowDowngradeToInsecureRepositories» per anul·lar-ho." #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "The repository '%s' is not signed." -msgstr "El directori %s estĂ desviat" +msgstr "El repositori «%s» no estĂ signat." #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "The repository '%s' does not have a Release file." -msgstr "El directori %s estĂ desviat" +msgstr "El repositori «%s» ja no tĂ© fitxer de publicaciĂ³ «Release»." #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "The repository '%s' provides only weak security information." -msgstr "El directori %s estĂ desviat" +msgstr "El repositori «%s» nomĂ©s proporciona informaciĂ³ de seguretat feble." #: apt-pkg/acquire-item.cc ftparchive/writer.cc #, c-format @@ -249,6 +259,8 @@ msgstr "La suma resum no concorda" #: apt-pkg/acquire-item.cc msgid "Insufficient information available to perform this download securely" msgstr "" +"La informaciĂ³ disponible Ă©s insuficient per realitzar la baixada de manera " +"segura" #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc #, c-format @@ -260,14 +272,12 @@ msgid "Size mismatch" msgstr "La mida no concorda" #: apt-pkg/acquire-item.cc -#, fuzzy msgid "Invalid file format" -msgstr "OperaciĂ³ no vĂ lida %s" +msgstr "El format de fitxer no Ă©s vĂ lid" #: apt-pkg/acquire-item.cc -#, fuzzy msgid "Signature error" -msgstr "Error d'escriptura" +msgstr "Hi ha hagut un error en la signatura" #. TRANSLATORS: %s is a single techy word like 'NODATA' #: apt-pkg/acquire-item.cc methods/gpgv.cc @@ -276,16 +286,18 @@ msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" +"El fitxer signat en clar no Ă©s vĂ lid, s'ha obtingut «%s». Comprovi si la " +"xarxa requereix autenticaciĂ³." #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "" "An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s" msgstr "" -"S'ha produĂ¯t un error durant la verificaciĂ³ de la signatura. El dipĂ²sit no " -"estĂ actualitzat i s'emprarĂ el fitxer d'Ăndex anterior. Error del GPG: %s: " -"%s\n" +"S'ha produĂ¯t un error durant la verificaciĂ³ de la signatura. El repositori " +"no estĂ actualitzat i s'emprarĂ el fitxer d'Ăndex anterior. Error del GPG: " +"%s: %s" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) #: apt-pkg/acquire-item.cc @@ -299,6 +311,8 @@ msgid "" "Skipping acquire of configured file '%s' as repository '%s' doesn't support " "architecture '%s'" msgstr "" +"S'omet l'Ăºs del fitxer configurat «%s» ja que el repositori «%s» no admet " +"l'arquitectura «%s»" #: apt-pkg/acquire-item.cc #, c-format @@ -315,6 +329,8 @@ msgid "" "Skipping acquire of configured file '%s' as repository '%s' provides only " "weak security information for it" msgstr "" +"S'omet l'adquisiciĂ³ del fitxer configurat «%s» ja que el repositori «%s» " +"nomĂ©s proporciona informaciĂ³ de seguretat feble per fer-ho" #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is #. the time since then the file is invalid - formatted in the same way as in @@ -353,24 +369,24 @@ msgstr "No es troba una font per baixar la versiĂ³ «%s» de «%s»" msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -"L'Ăndex dels fitxers en el paquet estĂ corromput. Fitxer no existent: camp " -"per al paquet %s." +"L'Ăndex dels fitxers en el paquet estĂ corromput. El fitxer no existeix: " +"camp per al paquet %s." #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1 #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "Changelog unavailable for %s=%s" -msgstr "Registre de canvis per a %s (%s)" +msgstr "El registre de canvis no estĂ disponible per a %s=%s" #: apt-pkg/acquire-worker.cc #, c-format msgid "The method '%s' is explicitly disabled via configuration." -msgstr "" +msgstr "El mètode «%s» estĂ desactivat explĂcitament per la configuraciĂ³." #: apt-pkg/acquire-worker.cc methods/connect.cc #, c-format msgid "If you meant to use Tor remember to use %s instead of %s." -msgstr "" +msgstr "Si vol usar Tor recordi d'usar «%s» en lloc de «%s»" #: apt-pkg/acquire-worker.cc #, c-format @@ -378,9 +394,9 @@ msgid "The method driver %s could not be found." msgstr "No s'ha pogut trobar el mètode de control %s." #: apt-pkg/acquire-worker.cc -#, fuzzy, c-format +#, c-format msgid "Is the package %s installed?" -msgstr "Comproveu si el paquet «dpkgdev» estĂ instaÅ€lat.\n" +msgstr "EstĂ instal·lat el paquet %s?" #: apt-pkg/acquire-worker.cc #, c-format @@ -388,10 +404,11 @@ msgid "Method %s did not start correctly" msgstr "El mètode %s no s'ha iniciat correctament" #: apt-pkg/acquire-worker.cc -#, fuzzy, c-format +#, c-format msgid "" "Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]." -msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro." +msgstr "" +"Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu [Intro]." #: apt-pkg/acquire.cc apt-pkg/cdrom.cc #, c-format @@ -412,18 +429,24 @@ msgstr "No es pot blocar el directori %s" #, c-format msgid "No sandbox user '%s' on the system, can not drop privileges" msgstr "" +"No existeix l'usuari d'entorn segur «%s», no es poden ignorar els privilegis" #: apt-pkg/acquire.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Can't drop privileges for downloading as file '%s' couldn't be accessed " +#| "by user '%s'." msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" +"No es poden ignorar els privilegis per descarregar mentre no es pugui " +"accedir a «%s» amb l'usuari «%s»." #: apt-pkg/acquire.cc apt-pkg/clean.cc -#, fuzzy, c-format +#, c-format msgid "Clean of %s is not supported" -msgstr "El tipus de fitxer Ăndex «%s» no estĂ suportat" +msgstr "No estĂ suportada la neteja de «%s» " #: apt-pkg/acquire.cc apt-pkg/clean.cc apt-pkg/contrib/cdromutl.cc #: methods/mirror.cc @@ -448,7 +471,7 @@ msgstr "S'estĂ obtenint el fitxer %li de %li" msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -"El paquet %s necessita ser reinstaÅ€lat, perĂ² no se li pot trobar un arxiu." +"El paquet %s necessita ser reinstal·lat, perĂ² no se li pot trobar un arxiu." #: apt-pkg/algorithms.cc msgid "" @@ -504,9 +527,9 @@ msgid "Couldn't find any package by regex '%s'" msgstr "No s'ha pogut trobar el paquet a travĂ©s de l'expressiĂ³ regular «%s»" #: apt-pkg/cacheset.cc -#, fuzzy, c-format +#, c-format msgid "Couldn't find any package by glob '%s'" -msgstr "No s'ha pogut trobar el paquet a travĂ©s de l'expressiĂ³ regular «%s»" +msgstr "No s'ha pogut trobar cap paquet a travĂ©s de l'expressiĂ³ regular «%s»" #: apt-pkg/cacheset.cc apt-private/private-show.cc #, c-format @@ -538,8 +561,8 @@ msgstr "" #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -"No s'ha pogut seleccionar la versiĂ³ instaÅ€lada del paquet %s ja que no estĂ " -"instaÅ€lada" +"No s'ha pogut seleccionar la versiĂ³ instal·lada del paquet %s ja que no estĂ " +"instal·lada" #: apt-pkg/cacheset.cc #, c-format @@ -547,7 +570,7 @@ msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -"No s'han pogut seleccionar la versiĂ³ instaÅ€lada ni la candidata del paquet " +"No s'han pogut seleccionar la versiĂ³ instal·lada ni la candidata del paquet " "«%s» ja que no estan disponibles cap de les dues" #: apt-pkg/cdrom.cc @@ -591,7 +614,7 @@ msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -"S'han trobat %zu Ăndexos de paquets, %zu Ăndexos de fonts, %zu indexos de " +"S'han trobat %zu Ăndexos de paquets, %zu Ăndexos de fonts, %zu Ăndex de " "traduccions i %zu signatures\n" #: apt-pkg/cdrom.cc @@ -647,18 +670,21 @@ msgid "Failed to stat the cdrom" msgstr "No s'ha pogut fer «stat» del cdrom" #: apt-pkg/contrib/cmndline.cc -#, fuzzy, c-format +#, c-format msgid "" "Command line option '%c' [from %s] is not understood in combination with the " "other options." -msgstr "L'opciĂ³ de la lĂnia d'ordres «%c» [de %s] Ă©s desconeguda." +msgstr "" +"No s'admet l'opciĂ³ de la lĂnia d'ordres «%c» [de %s] en combinaciĂ³ amb " +"altres opcions" #: apt-pkg/contrib/cmndline.cc -#, fuzzy, c-format +#, c-format msgid "" "Command line option %s is not understood in combination with the other " "options" -msgstr "No s'entĂ©n l'opciĂ³ de la lĂnia d'ordres %s" +msgstr "" +"No s'admet l'opciĂ³ de la lĂnia d'ordres %s en combinaciĂ³ amb altres opcions" #: apt-pkg/contrib/cmndline.cc #, c-format @@ -733,7 +759,7 @@ msgstr "Error sintĂ ctic %s:%u: Hi ha masses fitxers include niats" #: apt-pkg/contrib/configuration.cc #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "Error sintĂ ctic %s:%u: InclusiĂ³ des d'aquĂ" +msgstr "Error sintĂ ctic %s:%u: InclĂ²s des d'aquĂ" #: apt-pkg/contrib/configuration.cc #, c-format @@ -761,7 +787,7 @@ msgstr "Ha hagut un problema en desenllaçar el fitxer %s" #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -"No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s" +"No s'empren bloquejos per a llegir el fitxer de blocat de sols lectura %s" #: apt-pkg/contrib/fileutl.cc #, c-format @@ -771,7 +797,7 @@ msgstr "No es pot resoldre el fitxer de blocat %s" #: apt-pkg/contrib/fileutl.cc #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs" +msgstr "No s'empren bloquejos per al fitxer de blocat %s de muntar nfs" #: apt-pkg/contrib/fileutl.cc #, c-format @@ -845,7 +871,7 @@ msgstr "Ha hagut un problema en tancar el fitxer gzip %s" #: apt-pkg/contrib/fileutl.cc msgid "Unexpected end of file" -msgstr "" +msgstr "Fi de fitxer no esperat" #: apt-pkg/contrib/fileutl.cc msgid "Failed to create subprocess IPC" @@ -890,9 +916,9 @@ msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" #: apt-pkg/contrib/fileutl.cc cmdline/apt-extracttemplates.cc -#, fuzzy, c-format +#, c-format msgid "Unable to mkstemp %s" -msgstr "No es pot veure l'estat de %s" +msgstr "No es pot crear el fitxer temporal %s" #: apt-pkg/contrib/fileutl.cc cmdline/apt-extracttemplates.cc #, c-format @@ -1010,7 +1036,7 @@ msgstr "No s'ha trobat la selecciĂ³ %s" #: apt-pkg/deb/debmetaindex.cc #, c-format msgid "Target %s wants to acquire the same file (%s) as %s from source %s" -msgstr "" +msgstr "L'objectiu %s vol obtenir el mateix fitxer (%s) que %s de l'origen %s" #. TRANSLATOR: an identifier like Packages; Releasefile key indicating #. a file like main/binary-amd64/Packages; filename and linenumber of @@ -1018,7 +1044,7 @@ msgstr "" #: apt-pkg/deb/debmetaindex.cc #, c-format msgid "Target %s (%s) is configured multiple times in %s and %s" -msgstr "" +msgstr "L'objectiu %s (%s) estĂ configurat diverses vegades en %s i %s" #: apt-pkg/deb/debmetaindex.cc #, c-format @@ -1041,6 +1067,8 @@ msgid "" "No Hash entry in Release file %s which is considered strong enough for " "security purposes" msgstr "" +"No existeix una entrada Resum «Hash» en l'arxiu «Release» %s que es " +"considera suficientment fort per raons de seguretat" #: apt-pkg/deb/debmetaindex.cc #, c-format @@ -1052,16 +1080,20 @@ msgstr "El camp «%s» al fitxer Release %s Ă©s invĂ lid" #, c-format msgid "Conflicting values set for option %s regarding source %s %s" msgstr "" +"S'han establert valors en conflicte per a l'opciĂ³ %s segons l'origen %s %s" #: apt-pkg/deb/debmetaindex.cc #, c-format msgid "Invalid value set for option %s regarding source %s %s (%s)" msgstr "" +"S'han establert valors no vĂ lids per a l'opciĂ³ %s segons l'origen %s %s (%s)" #: apt-pkg/deb/debmetaindex.cc #, c-format msgid "Conflicting values set for option %s regarding source %s %s: %s != %s" msgstr "" +"S'han establert valors en conflicte per a l'opciĂ³ %s segons l'origen %s %s: " +"%s != %s" #: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc #, c-format @@ -1100,7 +1132,7 @@ msgstr "No blocat" #: apt-pkg/deb/dpkgpm.cc #, c-format msgid "Installing %s" -msgstr "S'estĂ instaÅ€lant %s" +msgstr "S'estĂ instal·lant %s" #: apt-pkg/deb/dpkgpm.cc #, c-format @@ -1125,12 +1157,12 @@ msgstr "S'estĂ anotant la desapariciĂ³ de %s" #: apt-pkg/deb/dpkgpm.cc #, c-format msgid "Running post-installation trigger %s" -msgstr "S'estĂ executant l'activador de postinstaÅ€laciĂ³ %s" +msgstr "S'estĂ executant l'activador de postinstal·laciĂ³ %s" #: apt-pkg/deb/dpkgpm.cc #, c-format msgid "Installed %s" -msgstr "S'ha instaÅ€lat el paquet %s" +msgstr "S'ha instal·lat el paquet %s" #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc @@ -1179,13 +1211,13 @@ msgid "Completely removed %s" msgstr "S'ha suprimit completament el paquet %s" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy, c-format +#, c-format msgid "Can not write log (%s)" -msgstr "No es pot escriure en %s" +msgstr "No es pot escriure en el fitxer de registre (%s)" #: apt-pkg/deb/dpkgpm.cc msgid "Is /dev/pts mounted?" -msgstr "" +msgstr "Comprovi que «/dev/pts» estĂ muntat" #: apt-pkg/deb/dpkgpm.cc msgid "Operation was interrupted before it could finish" @@ -1206,7 +1238,7 @@ msgid "" "error from a previous failure." msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica que Ă©s un error " -"consequent de una fallida anterior." +"de seguiment de una fallida anterior." #: apt-pkg/deb/dpkgpm.cc msgid "" @@ -1225,13 +1257,12 @@ msgstr "" "falta de memĂ²ria" #: apt-pkg/deb/dpkgpm.cc -#, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " -"disc ple" +"No s'ha escrit cap informe perquè el missatge d'error indica una fallida en " +"el sistema local" #: apt-pkg/deb/dpkgpm.cc msgid "" @@ -1287,24 +1318,20 @@ msgid "Execute external solver" msgstr "Executa un resoledor extern" #: apt-pkg/edsp.cc -#, fuzzy msgid "Execute external planner" -msgstr "Executa un resoledor extern" +msgstr "Executa un planificador extern" #: apt-pkg/edsp.cc -#, fuzzy msgid "Send request to planner" -msgstr "Envia la peticiĂ³ al resoledor" +msgstr "Envia la peticiĂ³ al planificador" #: apt-pkg/edsp.cc -#, fuzzy msgid "Send scenario to planner" -msgstr "Envia l'escenari al resoledor" +msgstr "Envia l'escenari al planificador" #: apt-pkg/edsp.cc -#, fuzzy msgid "External planner failed without a proper error message" -msgstr "El resoledor extern ha fallat sense un missatge d'error adient" +msgstr "El planificador extern ha fallat sense un missatge d'error adient" #: apt-pkg/indexcopy.cc #, c-format @@ -1350,7 +1377,7 @@ msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat." #: apt-pkg/install-progress.cc #, c-format msgid "Progress: [%3i%%]" -msgstr "" +msgstr "ProgrĂ©s: [%3i%%]" #. send status information that we are about to fork dpkg #: apt-pkg/install-progress.cc @@ -1378,7 +1405,7 @@ msgid "" "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"Aquesta instaÅ€laciĂ³ requereix suprimir temporalment el paquet essencial %s " +"Aquesta instal·laciĂ³ requereix suprimir temporalment el paquet essencial %s " "per qĂ¼estiĂ³ d'un bucle de Conflictes/Pre-dependències. AixĂ² sol ser una cosa " "dolenta, perĂ² si realment desitgeu fer-la, activeu l'opciĂ³ APT::Force-" "LoopBreak." @@ -1401,14 +1428,17 @@ msgid "This APT does not support the versioning system '%s'" msgstr "Aquest APT no suporta el sistema de versions «%s»" #: apt-pkg/pkgcache.cc -#, fuzzy, c-format +#, c-format msgid "The package cache was built for different architectures: %s vs %s" -msgstr "La memĂ²ria cau de paquets fou creada per a una arquitectura diferent" +msgstr "" +"La memĂ²ria cau de paquets fou creada per a una arquitectura diferent: %s " +"contra %s" #: apt-pkg/pkgcache.cc -#, fuzzy msgid "The package cache file is corrupted, it has the wrong hash" -msgstr "El fitxer de memĂ²ria cau de paquets estĂ corromput, Ă©s massa petit" +msgstr "" +"El fitxer de memĂ²ria cau de paquets estĂ corromput, tĂ© un resum «hash» " +"incorrecte" #: apt-pkg/pkgcache.cc msgid "Depends" @@ -1535,6 +1565,7 @@ msgstr "No s'ha entès el pin de tipus %s" #, c-format msgid "%s: Value %s is outside the range of valid pin priorities (%d to %d)" msgstr "" +"%s: El valor %s estĂ fora del rang de les prioritats de pin vĂ lid (%d a %d)" #: apt-pkg/policy.cc msgid "No priority (or zero) specified for pin" @@ -1542,9 +1573,9 @@ msgstr "No hi ha prioritat especificada per al pin (o Ă©s zero)" #. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports #: apt-pkg/sourcelist.cc -#, fuzzy, c-format +#, c-format msgid "Malformed entry %u in %s file %s (%s)" -msgstr "LĂnia predominant %s malformada %llu nĂºm 1" +msgstr "L'entrada %u estĂ mal formada en %s en el fitxer %s (%s)" #: apt-pkg/sourcelist.cc #, c-format @@ -1562,19 +1593,19 @@ msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no Ă©s conegut en la lĂnia %u de la llista de fonts %s" #: apt-pkg/sourcelist.cc -#, fuzzy, c-format +#, c-format msgid "Malformed stanza %u in source list %s (type)" -msgstr "La lĂnia %u Ă©s malformada en la llista de fonts %s (tipus)" +msgstr "La lĂnia %u estĂ mal formada en la llista de fonts %s (tipus)" #: apt-pkg/sourcelist.cc -#, fuzzy, c-format +#, c-format msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "El tipus «%s» no Ă©s conegut en la lĂnia %u de la llista de fonts %s" +msgstr "Es desconeix el tipus «%s» en la lĂnia %u de la llista de fonts %s" #: apt-pkg/sourcelist.cc #, c-format msgid "Unsupported file %s given on commandline" -msgstr "" +msgstr "S'ha subministrat el fitxer no admès %s en la lĂnia d'ordres" #: apt-pkg/srcrecords.cc msgid "You must put some 'source' URIs in your sources.list" @@ -1583,7 +1614,7 @@ msgstr "Heu de posar algunes URI 'font' en el vostre sources.list" #: apt-pkg/tagfile.cc #, c-format msgid "Cannot convert %s to integer: out of range" -msgstr "" +msgstr "No s'ha pogut convertir %s a sencer: fora de rang" #: apt-pkg/update.cc apt-private/private-download.cc #, c-format @@ -1620,14 +1651,14 @@ msgstr "Bai:%lu %s" #: apt-private/acqprogress.cc #, c-format msgid "Ign:%lu %s" -msgstr "" +msgstr "Ign:%lu %s" #. TRANSLATOR: Very short word to be displayed for files in 'apt-get update' #. which failed to download and the error is critical (compare "Ign:") #: apt-private/acqprogress.cc #, c-format msgid "Err:%lu %s" -msgstr "" +msgstr "Err:%lu %s" #: apt-private/acqprogress.cc #, c-format @@ -1639,7 +1670,7 @@ msgid " [Working]" msgstr " [Treballant]" #: apt-private/acqprogress.cc -#, fuzzy, c-format +#, c-format msgid "" "Media change: please insert the disc labeled\n" " '%s'\n" @@ -1647,7 +1678,7 @@ msgid "" msgstr "" "Canvi de medi: inseriu el disc amb l'etiqueta\n" " «%s»\n" -"en la unitat «%s» i premeu Intro\n" +"en la unitat «%s» i premeu [Intro]\n" #: apt-private/private-cachefile.cc msgid "Correcting dependencies..." @@ -1669,17 +1700,21 @@ msgstr "No es pot minimitzar el joc de versions revisades" msgid " Done" msgstr " Fet" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Potser voldreu executar «apt-get -f install» per a corregir-ho." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "Potser voldreu executar «apt --fix-broken install» per a corregir-ho." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Dependències sense satisfer. Proveu-ho emprant -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Dependències insatisfetes. Proveu amb «apt --fix-broken install» sense " +"paquets (o especifiqueu una soluciĂ³)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" -msgstr "" +msgstr "Ordenant" #: apt-private/private-cacheset.cc #, c-format @@ -1687,9 +1722,11 @@ msgid "Note, selecting '%s' for task '%s'\n" msgstr "Nota: s'estĂ seleccionant «%s» per a la tasca «%s»\n" #: apt-private/private-cacheset.cc -#, fuzzy, c-format +#, c-format msgid "Note, selecting '%s' for glob '%s'\n" -msgstr "Nota: s'estĂ seleccionant «%s» per a l'expressiĂ³ regular «%s»\n" +msgstr "" +"Tingues en compte que s'estĂ seleccionant «%s» per a l'expressiĂ³ regular " +"genèrica «%s»\n" #: apt-private/private-cacheset.cc #, c-format @@ -1702,9 +1739,8 @@ msgid "Package %s is a virtual package provided by:\n" msgstr "El paquet %s Ă©s un paquet virtual proveĂ¯t per:\n" #: apt-private/private-cacheset.cc -#, fuzzy msgid " [Installed]" -msgstr " [InstaÅ€lat]" +msgstr " [Instal·lat]" #: apt-private/private-cacheset.cc msgid " [Not candidate version]" @@ -1712,7 +1748,7 @@ msgstr "[VersiĂ³ no candidata]" #: apt-private/private-cacheset.cc msgid "You should explicitly select one to install." -msgstr "Necessiteu seleccionar-ne un explĂcitament per a instaÅ€lar-lo." +msgstr "Necessiteu seleccionar-ne un explĂcitament per a instal·lar-lo." #: apt-private/private-cacheset.cc #, c-format @@ -1732,7 +1768,7 @@ msgstr "Tot i que els segĂ¼ents paquets el reemplacen:" #: apt-private/private-cacheset.cc #, c-format msgid "Package '%s' has no installation candidate" -msgstr "El paquet «%s» no tĂ© candidat d'instaÅ€laciĂ³" +msgstr "El paquet «%s» no tĂ© candidat d'instal·laciĂ³" #: apt-private/private-cacheset.cc #, c-format @@ -1744,13 +1780,13 @@ msgstr "Els paquets virtuals com «%s» no es poden suprimir\n" #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" -"El paquet «%s» no estĂ instaÅ€lat, aixĂ doncs no es suprimirĂ . VolĂeu dir " +"El paquet «%s» no estĂ instal·lat, aixĂ doncs no es suprimirĂ . VolĂeu dir " "«%s»?\n" #: apt-private/private-cacheset.cc apt-private/private-install.cc #, c-format msgid "Package '%s' is not installed, so not removed\n" -msgstr "El paquet «%s» no estĂ instaÅ€lat, aixĂ doncs no es suprimirĂ \n" +msgstr "El paquet «%s» no estĂ instal·lat, aixĂ doncs no es suprimirĂ \n" #: apt-private/private-cacheset.cc #, c-format @@ -1759,12 +1795,12 @@ msgstr "Nota: s'estĂ seleccionant «%s» en lloc de «%s»\n" #: apt-private/private-cmndline.cc msgid "Most used commands:" -msgstr "" +msgstr "Ordres mĂ©s utilitzades:" #: apt-private/private-cmndline.cc #, c-format msgid "See %s for more information about the available commands." -msgstr "" +msgstr "Vegi %s per a mĂ©s informaciĂ³ sobre les ordres disponibles." #: apt-private/private-cmndline.cc msgid "" @@ -1773,6 +1809,11 @@ msgid "" "Package and version choices can be expressed via apt_preferences(5).\n" "Security details are available in apt-secure(8).\n" msgstr "" +"Les opcions i sintaxi de configuraciĂ³ es detallen en apt.conf(5).\n" +"Pot trobar informaciĂ³ sobre com configurar les fonts en sources.list(5).\n" +"Les eleccions de versiĂ³ i de paquets es poden expressar per mitjĂ de " +"apt_preferences(5).\n" +"Els detalls de la seguretat estan disponibles en apt-secure(8).\n" #: apt-private/private-cmndline.cc msgid "This APT has Super Cow Powers." @@ -1780,7 +1821,7 @@ msgstr "Aquest APT tĂ© superpoders bovins." #: apt-private/private-cmndline.cc msgid "This APT helper has Super Meep Powers." -msgstr "" +msgstr "Aquest Ajudant d'APT tĂ© poders de Super Plor." #: apt-private/private-depends.cc apt-private/private-show.cc #: cmdline/apt-mark.cc @@ -1801,20 +1842,23 @@ msgstr "No s'ha pogut autenticar alguns paquets" #: apt-private/private-download.cc msgid "Install these packages without verification?" -msgstr "Voleu instaÅ€lar aquests paquets sense verificar-los?" +msgstr "Voleu instal·lar aquests paquets sense verificar-los?" #: apt-private/private-download.cc apt-private/private-install.cc msgid "" "--force-yes is deprecated, use one of the options starting with --allow " "instead." msgstr "" +"--force-yes estĂ en desĂºs, en el seu lloc utilitzi una de les opcions que " +"comencen per --allow." #: apt-private/private-download.cc -#, fuzzy msgid "" "There were unauthenticated packages and -y was used without --allow-" "unauthenticated" -msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes" +msgstr "" +"Hi ha paquets sense autenticaciĂ³ i s'ha emprat -y sense --allow-" +"unauthenticated (permetre no autenticats)" #: apt-private/private-download.cc #, c-format @@ -1837,7 +1881,7 @@ msgid "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." msgstr "" -"No s'han pogut instaÅ€lar alguns paquets. AixĂ² pot ser degut a que heu\n" +"No s'han pogut instal·lar alguns paquets. AixĂ² pot ser degut a que heu\n" "demanat una situaciĂ³ impossible o que esteu emprant la distribuciĂ³\n" "«unstable» i alguns paquets requerits encara no han estat creats o bĂ©\n" "encara no els hi han introduĂ¯t des d'«Incoming»." @@ -1861,6 +1905,14 @@ msgid "Broken packages" msgstr "Paquets trencats" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"No es poden baixar alguns arxius, proveu a executar apt-get update o " +"intenteu-ho amb --fix-missing." + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "S'ha produĂ¯t un error intern, s'ha cridat a InstallPackages amb paquets " @@ -1872,22 +1924,26 @@ msgstr "" "Els paquets necessiten ser suprimits perĂ² s'ha inhabilitat la supressiĂ³." #: apt-private/private-install.cc -#, fuzzy msgid "" "Essential packages were removed and -y was used without --allow-remove-" "essential." -msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes" +msgstr "" +"S'han eliminats paquets essencials i s'ha usat -y sense --allow-remove-" +"essencial (permetre eliminar essencials)" #: apt-private/private-install.cc -#, fuzzy msgid "Packages were downgraded and -y was used without --allow-downgrades." -msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes" +msgstr "" +"Els paquets s'han revertit i s'ha usat -y sense --allow-downgrades (permetre " +"revertir)." #: apt-private/private-install.cc msgid "" "Held packages were changed and -y was used without --allow-change-held-" "packages." msgstr "" +"Es van canviar els paquets retinguts i es va utilitzar -y sense --allow-" +"change-held-packages." #: apt-private/private-install.cc msgid "Internal error, Ordering didn't finish" @@ -1965,14 +2021,6 @@ msgid "Download complete and in download only mode" msgstr "Baixada completa i en mode de nomĂ©s baixada" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"No es poden baixar alguns arxius, proveu a executar apt-get update o " -"intenteu-ho amb --fix-missing." - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i els medi intercanviables actualment no estan suportats" @@ -1982,7 +2030,7 @@ msgstr "No es poden corregir els paquets que falten." #: apt-private/private-install.cc msgid "Aborting install." -msgstr "S'estĂ avortant la instaÅ€laciĂ³." +msgstr "S'estĂ avortant la instal·laciĂ³." #: apt-private/private-install.cc msgid "" @@ -1995,7 +2043,7 @@ msgstr[0] "" "El segĂ¼ent paquet ha desaparegut del vostre sistema ja\n" "que tots els fitxers s'han sobreescrit per altres paquets:" msgstr[1] "" -"Els segĂ¼ents paquets han desaparegut del vostre sistema ja\n" +"El segĂ¼ents paquets han desaparegut del vostre sistema ja\n" "que tots els fitxers s'han sobreescrit per altres paquets:" #: apt-private/private-install.cc @@ -2027,9 +2075,9 @@ msgid_plural "" "The following packages were automatically installed and are no longer " "required:" msgstr[0] "" -"El paquet segĂ¼ent s'ha instaÅ€lat automĂ ticament i ja no serĂ necessari:" +"El paquet segĂ¼ent s'ha instal·lat automĂ ticament i ja no serĂ necessari:" msgstr[1] "" -"Els paquets segĂ¼ents s'han instaÅ€lat automĂ ticament i ja no sĂ³n necessaris:" +"El paquets segĂ¼ents s'han instal·lat automĂ ticament i ja no serĂ necessaris:" #: apt-private/private-install.cc #, c-format @@ -2037,9 +2085,9 @@ msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "" -"El paquet %lu es va instaÅ€lar automĂ ticament i ja no Ă©s necessari:\n" +"El paquet %lu es va instal·lar automĂ ticament i ja no Ă©s necessari:\n" msgstr[1] "" -"Els paquets %lu es van s'instaÅ€lar automĂ ticament i ja no sĂ³n necessaris:\n" +"Els paquets %lu es van instal·lar automĂ ticament i ja no sĂ³n necessaris:\n" #: apt-private/private-install.cc #, c-format @@ -2049,21 +2097,8 @@ msgstr[0] "Empreu «%s» per a suprimir-lo." msgstr[1] "Empreu «%s» per a suprimir-los." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Potser voldreu executar «apt-get -f install» per corregir-ho:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Dependències insatisfetes. Proveu amb «apt-get -f install» sense paquets (o " -"especifiqueu una soluciĂ³)." - -#: apt-private/private-install.cc -#, fuzzy msgid "The following additional packages will be installed:" -msgstr "S'instaÅ€laran els segĂ¼ents paquets extres:" +msgstr "S'instal·laran els segĂ¼ents paquets extres:" #: apt-private/private-install.cc msgid "Suggested packages:" @@ -2077,29 +2112,29 @@ msgstr "Paquets recomanats:" #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -"S'estĂ ometent %s, ja estĂ instaÅ€lat i l'actualitzaciĂ³ no estĂ establerta.\n" +"S'estĂ ometent %s, ja estĂ instal·lat i l'actualitzaciĂ³ no estĂ establerta.\n" #: apt-private/private-install.cc #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" -"S'estĂ ometent '%s', no estĂ instaÅ€lat i nomĂ©s es demana l'actualitzaciĂ³.\n" +"S'estĂ ometent '%s', no estĂ instal·lat i nomĂ©s es demana l'actualitzaciĂ³.\n" #: apt-private/private-install.cc #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "No es possible la reinstaÅ€laciĂ³ del paquet %s, no es pot baixar.\n" +msgstr "No es possible la reinstal·laciĂ³ del paquet %s, no es pot baixar.\n" #. TRANSLATORS: First string is package name, second is version #: apt-private/private-install.cc -#, fuzzy, c-format +#, c-format msgid "%s is already the newest version (%s).\n" -msgstr "%s ja es troba en la versiĂ³ mĂ©s recent.\n" +msgstr "%s ja estĂ en la versiĂ³ mĂ©s recent (%s).\n" #: apt-private/private-install.cc cmdline/apt-get.cc cmdline/apt-mark.cc #, c-format msgid "%s set to manually installed.\n" -msgstr "S'ha marcat %s com instaÅ€lat manualment.\n" +msgstr "S'ha marcat %s com instal·lat manualment.\n" #: apt-private/private-install.cc #, c-format @@ -2113,15 +2148,15 @@ msgstr "VersiĂ³ seleccionada «%s» (%s) per a «%s» degut a «%s»\n" #: apt-private/private-list.cc msgid "Listing" -msgstr "" +msgstr "Llistant" #: apt-private/private-list.cc #, c-format msgid "There is %i additional version. Please use the '-a' switch to see it" msgid_plural "" "There are %i additional versions. Please use the '-a' switch to see them." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hi ha %i versiĂ³ addicional. Utilitzi l'opciĂ³ «-a» per veure-les" +msgstr[1] "Hi han %i versions addicionals. Utilitzi l'opciĂ³ «-a» per veure-les" #. TRANSLATORS: placeholder is a binary name like apt or apt-get #: apt-private/private-main.cc @@ -2139,54 +2174,51 @@ msgstr "" #: apt-private/private-output.cc apt-private/private-show.cc msgid "unknown" -msgstr "" +msgstr "desconegut" #: apt-private/private-output.cc -#, fuzzy, c-format +#, c-format msgid "[installed,upgradable to: %s]" -msgstr " [InstaÅ€lat]" +msgstr "[Instal·lat, actualitzable a: %s]" #: apt-private/private-output.cc -#, fuzzy msgid "[installed,local]" -msgstr " [InstaÅ€lat]" +msgstr "[instal·lat,local]" #: apt-private/private-output.cc msgid "[installed,auto-removable]" -msgstr "" +msgstr "[instal·lat, auto-eliminable]" #: apt-private/private-output.cc -#, fuzzy msgid "[installed,automatic]" -msgstr " [InstaÅ€lat]" +msgstr "[instal·lat,automĂ tic]" #: apt-private/private-output.cc -#, fuzzy msgid "[installed]" -msgstr " [InstaÅ€lat]" +msgstr "[instal·lat]" #: apt-private/private-output.cc #, c-format msgid "[upgradable from: %s]" -msgstr "" +msgstr "[actualitzable des de: %s]" #: apt-private/private-output.cc msgid "[residual-config]" -msgstr "" +msgstr "[configuraciĂ³-residual]" #: apt-private/private-output.cc #, c-format msgid "but %s is installed" -msgstr "perĂ² estĂ instaÅ€lat %s" +msgstr "perĂ² estĂ instal·lat %s" #: apt-private/private-output.cc #, c-format msgid "but %s is to be installed" -msgstr "perĂ² s'instaÅ€larĂ %s" +msgstr "perĂ² s'instal·larĂ %s" #: apt-private/private-output.cc msgid "but it is not installable" -msgstr "perĂ² no Ă©s instaÅ€lable" +msgstr "perĂ² no Ă©s instal·lable" #: apt-private/private-output.cc msgid "but it is a virtual package" @@ -2194,11 +2226,11 @@ msgstr "perĂ² Ă©s un paquet virtual" #: apt-private/private-output.cc msgid "but it is not going to be installed" -msgstr "perĂ² no serĂ instaÅ€lat" +msgstr "perĂ² no serĂ instal·lat" #: apt-private/private-output.cc msgid "but it is not installed" -msgstr "perĂ² no estĂ instaÅ€lat" +msgstr "perĂ² no estĂ instal·lat" #: apt-private/private-output.cc msgid " or" @@ -2210,7 +2242,7 @@ msgstr "Els segĂ¼ents paquets tenen dependències sense satisfer:" #: apt-private/private-output.cc msgid "The following NEW packages will be installed:" -msgstr "S'instaÅ€laran els paquets NOUS segĂ¼ents:" +msgstr "S'instal·laran els paquets NOUS segĂ¼ents:" #: apt-private/private-output.cc msgid "The following packages will be REMOVED:" @@ -2248,12 +2280,12 @@ msgstr "" #: apt-private/private-output.cc #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu actualitzats, %lu nous a instaÅ€lar, " +msgstr "%lu actualitzats, %lu nous a instal·lar, " #: apt-private/private-output.cc #, c-format msgid "%lu reinstalled, " -msgstr "%lu reinstaÅ€lats, " +msgstr "%lu reinstal·lats, " #: apt-private/private-output.cc #, c-format @@ -2268,7 +2300,7 @@ msgstr "%lu a suprimir i %lu no actualitzats.\n" #: apt-private/private-output.cc #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu no instaÅ€lats o suprimits completament.\n" +msgstr "%lu no instal·lats o suprimits completament.\n" #. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] #. e.g. "Do you want to continue? [Y/n] " @@ -2302,7 +2334,7 @@ msgstr "Heu de donar com a mĂnim un patrĂ³ de cerca" #: apt-private/private-search.cc msgid "Full Text Search" -msgstr "" +msgstr "Buscar en tot el text" #: apt-private/private-show.cc cmdline/apt-cache.cc #, c-format @@ -2314,12 +2346,13 @@ msgstr "El fitxer %s del paquet estĂ desincronitzat." msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" "There are %i additional records. Please use the '-a' switch to see them." -msgstr[0] "" +msgstr[0] "Hi ha %i registre addicional. Utilitzi l'opciĂ³ «-a» per veure'l." msgstr[1] "" +"Hi han %i registres addicionals. Utilitzi l'opciĂ³ «-a» per veure'ls." #: apt-private/private-show.cc msgid "not a real package (virtual)" -msgstr "" +msgstr "no Ă©s un paquet real (virtual)" #: apt-private/private-show.cc msgid "Package files:" @@ -2339,11 +2372,11 @@ msgstr "Paquets etiquetats:" #: apt-private/private-show.cc #, c-format msgid "%s -> %s with priority %d\n" -msgstr "" +msgstr "%s -> %s amb prioritat %d\n" #: apt-private/private-show.cc msgid " Installed: " -msgstr " InstaÅ€lat: " +msgstr " Instal·lat: " #: apt-private/private-show.cc msgid " Candidate: " @@ -2359,19 +2392,19 @@ msgid " Version table:" msgstr " Taula de versiĂ³:" #: apt-private/private-source.cc -#, fuzzy, c-format +#, c-format msgid "Can not find a package for architecture '%s'" -msgstr "No s'ha pogut trobar el paquet a travĂ©s de l'expressiĂ³ regular «%s»" +msgstr "No s'ha pogut trobar el paquet per l'arquitectura «%s»" #: apt-private/private-source.cc -#, fuzzy, c-format +#, c-format msgid "Can not find a package '%s' with version '%s'" -msgstr "No s'ha pogut trobar el paquet a travĂ©s de l'expressiĂ³ regular «%s»" +msgstr "No s'ha pogut trobar el paquet «%s» amb versiĂ³ «%s»" #: apt-private/private-source.cc -#, fuzzy, c-format +#, c-format msgid "Can not find a package '%s' with release '%s'" -msgstr "No s'ha pogut trobar el paquet a travĂ©s de l'expressiĂ³ regular «%s»" +msgstr "No s'ha pogut trobar el paquet «%s» amb publicaciĂ³ «%s»" #: apt-private/private-source.cc #, c-format @@ -2379,9 +2412,9 @@ msgid "Picking '%s' as source package instead of '%s'\n" msgstr "S'estĂ agafant «%s» com a paquet font en lloc de '%s'\n" #: apt-private/private-source.cc -#, fuzzy, c-format +#, c-format msgid "Can not find version '%s' of package '%s'" -msgstr "Descarta la versiĂ³ «%s» no disponible del paquet «%s»" +msgstr "No s'ha pogut trobar la versiĂ³ «%s» del paquet «%s»" #: apt-private/private-source.cc msgid "Must specify at least one package to fetch source for" @@ -2454,9 +2487,8 @@ msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Comproveu si el paquet «dpkgdev» estĂ instaÅ€lat.\n" +msgstr "Comproveu si el paquet «dpkgdev» estĂ instal·lat.\n" #: apt-private/private-source.cc #, c-format @@ -2493,25 +2525,29 @@ msgstr "" #, c-format msgid "Note, using directory '%s' to get the build dependencies\n" msgstr "" +"Tingues en compte que s'estĂ utilitzant «%s» per obtenir les dependències de " +"compilaciĂ³\n" #: apt-private/private-source.cc -#, fuzzy, c-format +#, c-format msgid "Note, using file '%s' to get the build dependencies\n" -msgstr "No es poden processar les dependències de construcciĂ³" +msgstr "" +"Tingues en compte que s'estĂ fent servir el fitxer «%s» per obtenir les " +"dependències de construcciĂ³\n" #: apt-private/private-source.cc msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcciĂ³" #: apt-private/private-sources.cc -#, fuzzy, c-format +#, c-format msgid "Failed to parse %s. Edit again? " -msgstr "No s'ha pogut canviar el nom de %s a %s" +msgstr "No s'ha pogut analitzar %s. Vol tornar-lo a editar? " #: apt-private/private-sources.cc #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "" +msgstr "El fitxer «%s» ha canviat, executi «apt-get update»." #: apt-private/private-unmet.cc #, c-format @@ -2528,16 +2564,18 @@ msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" msgid_plural "" "%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" msgstr[0] "" +"Es pot actualitzar %i paquet. Executi «apt list --upgradable» per veure'l.\n" msgstr[1] "" +"Es poden actualitzar %i paquets. Executi «apt list --upgradable» per " +"veure'ls.\n" #: apt-private/private-update.cc msgid "All packages are up to date." -msgstr "" +msgstr "Tots els paquets estan actualitzats." #: cmdline/apt-cache.cc -#, fuzzy msgid "apt-cache stats does not take any arguments" -msgstr "L'ordre update no pren arguments" +msgstr "apt-cache stats no pren cap argument" #: cmdline/apt-cache.cc msgid "Total package names: " @@ -2620,6 +2658,17 @@ msgid "" "too long ago, but in exchange apt-cache works independently of the\n" "availability of the configured sources (e.g. offline).\n" msgstr "" +"Forma d'Ăºs: apt-cache [opcions] ordre\n" +" apt-cache [opcions] show paq1 [paq2 ...]\n" +"\n" +"apt-cache sol·licita i mostra la informaciĂ³ disponible sobre els paquets\n" +"instal·lats i els instal·lables. Funciona exclusivament amb les dades " +"obtingudes\n" +"en la memĂ²ria cau local mitjançant l'ordre «update», p.ex. «apt-get». Per " +"tant, \n" +"la informaciĂ³ mostrada pot estar desactualitzada si l'Ăºltima actualitzaciĂ³\n" +"es va fer fa molt, perĂ² a canvi apt-cache funciona independentment de la\n" +"disponibilitat de les fonts configurades (p.ex., sense connexiĂ³).\n" #: cmdline/apt-cache.cc msgid "Show source records" @@ -2654,9 +2703,8 @@ msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 5.0.3 Disc 1»" #: cmdline/apt-cdrom.cc -#, fuzzy msgid "Please insert a Disc in the drive and press [Enter]" -msgstr "Inseriu un disc en la unitat i premeu Intro" +msgstr "Inseriu un disc en la unitat i premeu [Intro]" #: cmdline/apt-cdrom.cc #, c-format @@ -2670,6 +2718,11 @@ msgid "" "See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " "mount point." msgstr "" +"No s'ha pogut detectar cap CD-ROM automĂ ticament o mitjançant el punt de " +"muntatge predeterminat.\n" +"Pot intentar l'opciĂ³ --cdrom per establir el punt de muntatge del CD-ROM.\n" +"Vegi «man apt-cdrom» para mĂ©s informaciĂ³ sobre l'autodetecciĂ³ i el punt de " +"muntatge del CD-ROM." #: cmdline/apt-cdrom.cc msgid "Repeat this process for the rest of the CDs in your set." @@ -2683,13 +2736,20 @@ msgid "" "media types as package sources to APT. The mount point and device\n" "information is taken from apt.conf(5), udev(7) and fstab(5).\n" msgstr "" +"Forma d'Ăºs: apt-cdrom [opcions] ordre\n" +"\n" +"apt-cdrom s'utilitza per afegir CDROM's, memĂ²ries flaix USB i altres tipus " +"de\n" +"mitjans desmuntables com a orĂgens de paquets a APT. El punt de muntatge i " +"la \n" +"informaciĂ³ sobre el dispositiu s'obtenen de apt.conf(5), udev(7) i " +"fstab(5).\n" #: cmdline/apt-config.cc msgid "Arguments not in pairs" msgstr "Els arguments no sĂ³n en parells" #: cmdline/apt-config.cc -#, fuzzy msgid "" "Usage: apt-config [options] command\n" "\n" @@ -2698,15 +2758,18 @@ msgid "" msgstr "" "Forma d'Ăºs: apt-config [opcions] ordre\n" "\n" -"apt-config Ă©s una eina simple per llegir el fitxer de configuraciĂ³ d'APT\n" +"apt-config Ă©s una interfĂcie per configurar les opcions usades per \n" +"totes les eines APT, destinada principalment a la depuraciĂ³ i \n" +"les seqĂ¼Ă¨ncies d'intèrpret d'ordres.\n" #: cmdline/apt-config.cc msgid "get configuration values via shell evaluation" msgstr "" +"obtenir valors de configuraciĂ³ mitjançant l'avaluaciĂ³ de l'intèrpret d'ordres" #: cmdline/apt-config.cc msgid "show the active configuration setting" -msgstr "" +msgstr "mostrar la configuraciĂ³ activa establerta" #: cmdline/apt-dump-solver.cc msgid "" @@ -2715,9 +2778,12 @@ msgid "" "apt-dump-solver is an interface to store an EDSP scenario in\n" "a file and optionally forwards it to another solver.\n" msgstr "" +"Forma d'Ăºs: apt-dump-solver\n" +"\n" +"apt-dump-solver Ă©s una interfĂcie per emmagatzemar un escenari EDSP en un " +"fitxer i opcionalment enviar-lo a un altre resolutor.\n" #: cmdline/apt-extracttemplates.cc -#, fuzzy msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -2725,20 +2791,16 @@ msgid "" "from debian packages. It is used mainly by debconf(1) to prompt for\n" "configuration questions before installation of packages.\n" msgstr "" -"Forma d'Ăºs: apt-extracttemplates fitxer1 [fitxer2 …]\n" +"Forma d'Ăºs: apt-extracttemplates fitxer1 [fitxer2 ...]\n" "\n" -"apt-extracttemplates Ă©s una eina per a extreure informaciĂ³ de\n" -"configuraciĂ³ i plantilles dels paquets debian\n" -"\n" -"Opcions:\n" -" -h Aquest text d'ajuda.\n" -" -t Estableix el directori temporal\n" -" -c=? Llegeix aquest fitxer de configuraciĂ³\n" -" -o=? Estableix una opciĂ³ de conf arbitrĂ ria, p.e. -o dir::cache=/tmp\n" +"apt-extracttemplates Ă©s una eina per a extreure informaciĂ³ dels \n" +"fitxers de configuraciĂ³ i plantilla dels paquets debian.\n" +"L'usa bĂ sicament debconf(1) per fer preguntes sobre la configuraciĂ³\n" +"abans d'instal·lar els paquets\n" #: cmdline/apt-extracttemplates.cc msgid "Cannot get debconf version. Is debconf installed?" -msgstr "No es pot determinar la versiĂ³ de debconf. EstĂ instaÅ€lat debconf?" +msgstr "No es pot determinar la versiĂ³ de debconf. EstĂ instal·lat debconf?" #: cmdline/apt-get.cc #, c-format @@ -2748,7 +2810,7 @@ msgstr "No s'ha pogut trobar el paquet %s" #: cmdline/apt-get.cc cmdline/apt-mark.cc #, c-format msgid "%s set to automatically installed.\n" -msgstr "S'ha marcat %s com instaÅ€lat automĂ ticament.\n" +msgstr "S'ha marcat %s com instal·lat automĂ ticament.\n" #: cmdline/apt-get.cc cmdline/apt-mark.cc msgid "" @@ -2768,7 +2830,6 @@ msgid "Supported modules:" msgstr "MĂ²duls suportats:" #: cmdline/apt-get.cc -#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -2783,9 +2844,10 @@ msgstr "" " apt-get [opcions] install|remove paq1 [paq2 …]\n" " apt-get [opcions] source paq1 [paq2 …]\n" "\n" -"apt-get Ă©s una interfĂcie de lĂnia d'ordres simple per\n" -"baixar i instaÅ€lar paquets. Les ordres mĂ©s freqĂ¼ents sĂ³n\n" -"update i install.\n" +"apt-get Ă©s una interfĂcie de lĂnia d'ordres per baixar paquets\n" +"i obtenir-ne informaciĂ³ d'orĂgens segurs. TambĂ© per instal·laciĂ³,\n" +"actualitzaciĂ³ i eliminaciĂ³ de paquets conjuntament amb les seves\n" +"dependències.\n" #: cmdline/apt-get.cc msgid "Retrieve new lists of packages" @@ -2797,7 +2859,7 @@ msgstr "Realitza una actualitzaciĂ³" #: cmdline/apt-get.cc msgid "Install new packages (pkg is libc6 not libc6.deb)" -msgstr "InstaÅ€la nous paquets (el paquet Ă©s libc6, no libc6.deb)" +msgstr "Instal·la nous paquets (el paquet Ă©s libc6, no libc6.deb)" #: cmdline/apt-get.cc msgid "Remove packages" @@ -2849,21 +2911,20 @@ msgstr "Baixa i mostra el registre de canvis del paquet" #: cmdline/apt-helper.cc msgid "Need one URL as argument" -msgstr "" +msgstr "Es necessita un URL com a argument" #: cmdline/apt-helper.cc -#, fuzzy msgid "Must specify at least one pair url/filename" -msgstr "Haureu d'especificar un paquet de codi font per a baixar" +msgstr "Haureu d'especificar com a mĂnim un parell de url/nom_de_fitxer" #: cmdline/apt-helper.cc msgid "Download Failed" -msgstr "" +msgstr "Ha fallat la baixada" #: cmdline/apt-helper.cc #, c-format msgid "GetSrvRec failed for %s" -msgstr "" +msgstr "Ha fallat GetSrvRec per %s" #: cmdline/apt-helper.cc msgid "" @@ -2874,25 +2935,31 @@ msgid "" "apt-helper bundles a variety of commands for shell scripts to use\n" "e.g. the same proxy configuration or acquire system as APT would.\n" msgstr "" +"Forma d'Ăºs: apt-helper [opcions] ordre\n" +" apt-helper [opcions] fitxer-cat fitxer ...\n" +" apt-helper [opcions] fitxer-descarrega uri ruta-destĂ\n" +"\n" +"apt-helper reuneix un conjunt d'ordres perquè s'utilitzin en seqĂ¼Ă¨ncies\n" +"d'intèrpret d'ordres. Per exemple la mateixa configuraciĂ³ de proxy \n" +"o el mateix sistema que APT.\n" #: cmdline/apt-helper.cc msgid "download the given uri to the target-path" -msgstr "" +msgstr "descarrega la uri proporcionada a la ruta de destinaciĂ³" #: cmdline/apt-helper.cc msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)" -msgstr "" +msgstr "buscar un registre SRV (per exemple, _http._tcp.ftp.debian.org)" #: cmdline/apt-helper.cc msgid "concatenate files, with automatic decompression" -msgstr "" +msgstr "concatenar fitxers, amb descompressiĂ³ automĂ tica" #: cmdline/apt-helper.cc msgid "detect proxy using apt.conf" -msgstr "" +msgstr "detecta el servidor intermediari usant apt.conf" #: cmdline/apt-internal-planner.cc -#, fuzzy msgid "" "Usage: apt-internal-planner\n" "\n" @@ -2900,19 +2967,13 @@ msgid "" "installation planner for the APT family like an external one,\n" "for debugging or the like.\n" msgstr "" -"Forma d'Ăºs: apt-extracttemplates fitxer1 [fitxer2 …]\n" -"\n" -"apt-extracttemplates Ă©s una eina per a extreure informaciĂ³ de\n" -"configuraciĂ³ i plantilles dels paquets debian\n" +"Forma d'Ăºs: apt-internal-planner\n" "\n" -"Opcions:\n" -" -h Aquest text d'ajuda.\n" -" -t Estableix el directori temporal\n" -" -c=? Llegeix aquest fitxer de configuraciĂ³\n" -" -o=? Estableix una opciĂ³ de conf arbitrĂ ria, p.e. -o dir::cache=/tmp\n" +"apt-internal-planner Ă©s una interfĂcie per usar el planificador\n" +"intern actual d'instal·laciĂ³. Tant per la famĂlia APT com per una\n" +"externa, per depuraciĂ³ i d'altres.\n" #: cmdline/apt-internal-solver.cc -#, fuzzy msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2920,31 +2981,26 @@ msgid "" "resolver for the APT family like an external one, for debugging or\n" "the like.\n" msgstr "" -"Forma d'Ăºs: apt-extracttemplates fitxer1 [fitxer2 …]\n" -"\n" -"apt-extracttemplates Ă©s una eina per a extreure informaciĂ³ de\n" -"configuraciĂ³ i plantilles dels paquets debian\n" +"Forma d'Ăºs: apt-internal-solver\n" "\n" -"Opcions:\n" -" -h Aquest text d'ajuda.\n" -" -t Estableix el directori temporal\n" -" -c=? Llegeix aquest fitxer de configuraciĂ³\n" -" -o=? Estableix una opciĂ³ de conf arbitrĂ ria, p.e. -o dir::cache=/tmp\n" +"apt-internal-solver Ă©s una interfĂcie per usar el resolutor\n" +"intern actual. Tant per la famĂlia APT com per una externa, \n" +"per depuraciĂ³ i d'altres.\n" #: cmdline/apt-mark.cc #, c-format msgid "%s can not be marked as it is not installed.\n" -msgstr "%s no es pot marcar perquè no estĂ instaÅ€lat.\n" +msgstr "%s no es pot marcar perquè no estĂ instal·lat.\n" #: cmdline/apt-mark.cc #, c-format msgid "%s was already set to manually installed.\n" -msgstr "%s ja estava marcat com instaÅ€lat manualment.\n" +msgstr "%s ja estava marcat com instal·lat manualment.\n" #: cmdline/apt-mark.cc #, c-format msgid "%s was already set to automatically installed.\n" -msgstr "%s ja estava marcat com instaÅ€lat automĂ ticament.\n" +msgstr "%s ja estava marcat com instal·lat automĂ ticament.\n" #: cmdline/apt-mark.cc #, c-format @@ -2973,17 +3029,17 @@ msgstr "S'ha cancel·lat la marca de retenciĂ³ en %s.\n" #: cmdline/apt-mark.cc #, c-format msgid "Selected %s for purge.\n" -msgstr "" +msgstr "Seleccionat %s per purgar.\n" #: cmdline/apt-mark.cc #, c-format msgid "Selected %s for removal.\n" -msgstr "" +msgstr "Seleccionat %s per eliminar.\n" #: cmdline/apt-mark.cc #, c-format msgid "Selected %s for installation.\n" -msgstr "" +msgstr "Seleccionat %s per instal·lar.\n" #: cmdline/apt-mark.cc msgid "" @@ -2994,38 +3050,41 @@ msgid "" "manipulate the dpkg(1) selection states of packages, and to list\n" "all packages with or without a certain marking.\n" msgstr "" +"Forma d'Ăºs: apt-mark [opcions] {auto|manual} paq1 [paq2 ...]\n" +"\n" +"apt-mark Ă©s una senzilla interfĂcie de lĂnia d'ordres per marcar paquets\n" +"com instal·lables tant manualment com automĂ ticament. TambĂ© es pot utilitzar " +"per\n" +"manipular els estats de selecciĂ³ de paquets de dpkg(1) i per llistar\n" +"tots els paquets amb o sense una marca determinada.\n" #: cmdline/apt-mark.cc -#, fuzzy msgid "Mark the given packages as automatically installed" -msgstr "S'ha marcat %s com instaÅ€lat automĂ ticament.\n" +msgstr "Marca els paquets proporcionats com instal·lables automĂ ticament" #: cmdline/apt-mark.cc -#, fuzzy msgid "Mark the given packages as manually installed" -msgstr "Comproveu si el paquet «dpkgdev» estĂ instaÅ€lat.\n" +msgstr "Marca els paquets proporcionats com instal·lables manualment" #: cmdline/apt-mark.cc msgid "Mark a package as held back" -msgstr "" +msgstr "Marca el paquet com retingut" #: cmdline/apt-mark.cc msgid "Unset a package set as held back" -msgstr "" +msgstr "Desmarca un paquet marcat com retingut" #: cmdline/apt-mark.cc -#, fuzzy msgid "Print the list of automatically installed packages" -msgstr "S'ha marcat %s com instaÅ€lat automĂ ticament.\n" +msgstr "Mostra la llista dels paquets instal·lats automĂ ticament" #: cmdline/apt-mark.cc -#, fuzzy msgid "Print the list of manually installed packages" -msgstr "S'ha marcat %s com instaÅ€lat manualment.\n" +msgstr "Mostra la llista dels paquets instal·lats manualment" #: cmdline/apt-mark.cc msgid "Print the list of package on hold" -msgstr "" +msgstr "Mostra la llista dels paquets retinguts" #: cmdline/apt-sortpkgs.cc msgid "Unknown package record!" @@ -3039,6 +3098,12 @@ msgid "" "By default it sorts by binary package information, but the -s option\n" "can be used to switch to source package ordering instead.\n" msgstr "" +"Forma d'Ăºs: apt-sortpkgs [opcions] fitxer1 [fitxer2 ...]\n" +"\n" +"apt-sortpkgs Ă©s una senzilla eina per ordenar els fitxers\n" +"d'informaciĂ³ dels paquets. De forma predeterminada, ordena a travĂ©s\n" +"de la informaciĂ³ del paquet binari, perĂ² es pot utilitzar l'opciĂ³\n" +"-s per ordenar a travĂ©s del l'origen.\n" #: cmdline/apt.cc msgid "" @@ -3050,60 +3115,61 @@ msgid "" "like apt-get and apt-cache, but enables options more suitable for\n" "interactive use by default.\n" msgstr "" +"Forma d'Ăºs: apt [opcions] ordre\n" +"\n" +"apt Ă©s un gestor de paquets de lĂnia d'ordres que proporciona ordres\n" +"per a la cerca i gestiĂ³ aixĂ com la sol·licitud d'informaciĂ³ sobre\n" +"els paquets. Proporciona la mateixa funcionalitat que les eines\n" +"APT especialitzades, com apt-get i apt-cache, perĂ² permet opcions \n" +"mĂ©s apropiades per a un Ăºs interactiu de forma predeterminada.\n" #. query #: cmdline/apt.cc msgid "list packages based on package names" -msgstr "" +msgstr "llista els paquets segons els noms" #: cmdline/apt.cc -#, fuzzy msgid "search in package descriptions" -msgstr "S'estĂ llegint la llista de paquets" +msgstr "cerca en les descripcions dels paquets" #: cmdline/apt.cc msgid "show package details" -msgstr "" +msgstr "mostra detalls del paquet" #. package stuff #: cmdline/apt.cc -#, fuzzy msgid "install packages" -msgstr "Paquets etiquetats:" +msgstr "instal·la paquets" #: cmdline/apt.cc -#, fuzzy msgid "remove packages" -msgstr "Paquets trencats" +msgstr "elimina paquets" #. system wide stuff #: cmdline/apt.cc -#, fuzzy msgid "update list of available packages" -msgstr "S'ha marcat %s com instaÅ€lat manualment.\n" +msgstr "actualitza la llista dels paquets disponibles" #: cmdline/apt.cc msgid "upgrade the system by installing/upgrading packages" -msgstr "" +msgstr "actualitza el sistema instal·lant/actualitzant paquets" #: cmdline/apt.cc msgid "upgrade the system by removing/installing/upgrading packages" -msgstr "" +msgstr "actualitza el sistema eliminant/instal·lant/actualitzant paquets" #. misc #: cmdline/apt.cc -#, fuzzy msgid "edit the source information file" -msgstr "S'estĂ llegint la informaciĂ³ de l'estat" +msgstr "edita el fitxer d'informaciĂ³ d'origen" #: dselect/install msgid "Bad default setting!" msgstr "ParĂ metre per defecte incorrecte!" #: dselect/install dselect/update -#, fuzzy msgid "Press [Enter] to continue." -msgstr "Premeu Intro per a continuar." +msgstr "Premeu [Intro] per a continuar." #: dselect/install msgid "Do you want to erase any previously downloaded .deb files?" @@ -3112,7 +3178,8 @@ msgstr "Voleu suprimir els paquets .deb baixats prèviament?" #: dselect/install msgid "Some errors occurred while unpacking. Packages that were installed" msgstr "" -"S'han produĂ¯t alguns errors en desempaquetar. Els paquets que s'han instaÅ€lat" +"S'han produĂ¯t alguns errors en desempaquetar. Els paquets que s'han " +"instal·lat" #: dselect/install msgid "will be configured. This may result in duplicate errors" @@ -3129,7 +3196,7 @@ msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" "anteriors a aquest missatge sĂ³n importants. Corregiu-los i torneu a executar " -"[I]nstaÅ€la una altra vegada" +"[I]nstal·la una altra vegada" #: dselect/update msgid "Merging available information" @@ -3271,9 +3338,8 @@ msgid "Unable to open DB file %s: %s" msgstr "No es pot obrir el fitxer de DB %s: %s" #: ftparchive/cachedb.cc -#, fuzzy msgid "Failed to read .dsc" -msgstr "No s'ha pogut llegir l'enllaç %s" +msgstr "No s'ha pogut llegir el fitxer .dsc" #: ftparchive/cachedb.cc msgid "Archive has no control record" @@ -3330,9 +3396,9 @@ msgstr "No es pot obrir %s" #. skip spaces #. find end of word #: ftparchive/override.cc -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu (%s)" -msgstr "LĂnia predominant %s malformada %llu nĂºm 1" +msgstr "Hi ha una sobreescriptura mal formada %s en la lĂnia %llu (%s)" #: ftparchive/override.cc #, c-format @@ -3429,6 +3495,55 @@ msgstr " %s no tĂ© una entrada dominant de font\n" msgid " %s has no binary override entry either\n" msgstr " %s no tĂ© una entrada dominant de binari\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "S'estan esperant les capçaleres" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "El servidor HTTP ha enviat una capçalera de resposta no vĂ lida" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "LĂnia de capçalera incorrecta" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "El servidor HTTP ha enviat una capçalera de Content-Length no vĂ lida" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "El servidor HTTP ha enviat una capçalera de Content-Range no vĂ lida" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Aquest servidor HTTP tĂ© el suport d'abast trencat" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Format de la data desconegut" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Capçalera de dades no vĂ lida" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Ha fallat la connexiĂ³" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" +"S'ha desactivat automĂ ticament %s a causa d'una resposta incorrecta del " +"servidor o del servidor intermedi. (man 5 apt.conf)" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Error intern" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3463,7 +3578,7 @@ msgstr "Fitxer no trobat" #: methods/connect.cc #, c-format msgid "Direct connection to %s domains is blocked by default." -msgstr "" +msgstr "Les connexions directes als dominis %s estan bloquejades per defecte." #: methods/connect.cc methods/http.cc #, c-format @@ -3517,9 +3632,9 @@ msgid "Temporary failure resolving '%s'" msgstr "S'ha produĂ¯t un error temporal en resoldre «%s»" #: methods/connect.cc -#, fuzzy, c-format +#, c-format msgid "System error resolving '%s:%s'" -msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)" +msgstr "Hi ha hagut un error de sistema en resoldre «%s:%s»" #: methods/connect.cc #, c-format @@ -3578,7 +3693,7 @@ msgstr "" #: methods/ftp.cc #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "L'ordre «%s» de l'script d'accĂ©s ha fallat, el servidor ha dit: %s" +msgstr "L'ordre «%s» del guiĂ³ d'accĂ©s ha fallat, el servidor ha dit: %s" #: methods/ftp.cc #, c-format @@ -3685,6 +3800,8 @@ msgstr "No es pot invocar" msgid "" "Signed file isn't valid, got '%s' (does the network require authentication?)" msgstr "" +"El fitxer signat en clar no Ă©s vĂ lid, s'ha obtingut «%s». Comprovi si la " +"xarxa requereix autenticaciĂ³." #: methods/gpgv.cc msgid "At least one invalid signature was encountered." @@ -3695,13 +3812,13 @@ msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error intern: La signatura Ă©s correcta, perĂ² no s'ha pogut determinar " -"l'emprempta digital de la clau!" +"l'empremta digital de la clau!" #: methods/gpgv.cc msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)" msgstr "" "No s'ha pogut executar el «apt-key» per a verificar la signatura (estĂ " -"instaÅ€lat el gnupg?)" +"instal·lat el gnupg?)" #: methods/gpgv.cc msgid "Unknown error executing apt-key" @@ -3711,7 +3828,7 @@ msgstr "S'ha produĂ¯t un error desconegut en executar el apt-key" #: methods/gpgv.cc #, c-format msgid "Signature by key %s uses weak digest algorithm (%s)" -msgstr "" +msgstr "La signatura per la clau %s usa un algoritme de repte dèbil (%s)" #: methods/gpgv.cc msgid "The following signatures were invalid:\n" @@ -3769,9 +3886,9 @@ msgid "Can not read mirror file '%s'" msgstr "No es pot llegir el fitxer rèplica «%s»" #: methods/mirror.cc -#, fuzzy, c-format +#, c-format msgid "No entry found in mirror file '%s'" -msgstr "No es pot llegir el fitxer rèplica «%s»" +msgstr "No s'ha trobat l'entrada en el fitxer de rèplica «%s»" #: methods/mirror.cc #, c-format @@ -3786,528 +3903,12 @@ msgstr "No s'ha pogut establir el temps de modificaciĂ³" msgid "Connection closed prematurely" msgstr "La connexiĂ³ s'ha tancat prematurament" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "S'estan esperant les capçaleres" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "El servidor HTTP ha enviat una capçalera de resposta no vĂ lida" - -#: methods/server.cc -msgid "Bad header line" -msgstr "LĂnia de capçalera incorrecta" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "El servidor HTTP ha enviat una capçalera de Content-Length no vĂ lida" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "El servidor HTTP ha enviat una capçalera de Content-Range no vĂ lida" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Aquest servidor HTTP tĂ© el suport d'abast trencat" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Format de la data desconegut" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Capçalera de dades no vĂ lida" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Ha fallat la connexiĂ³" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Error intern" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "Els fitxers buits no poden ser arxius vĂ lids" -#~ msgid "(not found)" -#~ msgstr "(no trobat)" - -#~ msgid " Package pin: " -#~ msgstr " Etiqueta del paquet: " - -#~ msgid "There is no public key available for the following key IDs:\n" -#~ msgstr "No hi ha cap clau pĂºblica disponible per als segĂ¼ents ID de clau:\n" - -#, fuzzy -#~ msgid "The repository is insufficiently signed by key %s (%s)" -#~ msgstr "El directori %s estĂ desviat" - -#~ msgid "Failed to fetch %s %s\n" -#~ msgstr "No s'ha pogut obtenir %s %s\n" - -#~ msgid "" -#~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " -#~ "packages" -#~ msgstr "" -#~ "La dependència %s en %s no es pot satisfer perquè %s no Ă©s permès als " -#~ "paquets «%s»" - -#~ msgid "" -#~ "%s dependency for %s cannot be satisfied because the package %s cannot be " -#~ "found" -#~ msgstr "" -#~ "La dependència %s en %s no es pot satisfer perquè no es pot trobar el " -#~ "paquet %s" - -#~ msgid "" -#~ "Failed to satisfy %s dependency for %s: Installed package %s is too new" -#~ msgstr "" -#~ "No s'ha pogut satisfer la dependència %s per a %s: El paquet instaÅ€lat %s " -#~ "Ă©s massa nou" - -#~ msgid "" -#~ "%s dependency for %s cannot be satisfied because candidate version of " -#~ "package %s can't satisfy version requirements" -#~ msgstr "" -#~ "La dependència %s per a %s no es pot satisfer perquè la versiĂ³ candidata " -#~ "del paquet %s no pot satisfer els requeriments de versions" - -#~ msgid "" -#~ "%s dependency for %s cannot be satisfied because package %s has no " -#~ "candidate version" -#~ msgstr "" -#~ "La dependència %s en %s no es pot satisfer perquè el paquet %s no tĂ© " -#~ "versiĂ³ candidata" - -#~ msgid "Failed to satisfy %s dependency for %s: %s" -#~ msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" - -#~ msgid "Build-dependencies for %s could not be satisfied." -#~ msgstr "No s'han pogut satisfer les dependències de construcciĂ³ per a %s" - -#~ msgid "Problem unlinking %s" -#~ msgstr "S'ha trobat un problema treient l'enllaç %s" - -#~ msgid "Failed to unlink %s" -#~ msgstr "No s'ha pogut alliberar %s" - -#~ msgid "" -#~ "Usage: apt-cache [options] command\n" -#~ " apt-cache [options] show pkg1 [pkg2 ...]\n" -#~ "\n" -#~ "apt-cache is a low-level tool used to query information\n" -#~ "from APT's binary cache files\n" -#~ msgstr "" -#~ "Forma d'Ăºs: apt-cache [opcions] ordre\n" -#~ " apt-cache [opcions] show paquet1 [paquet2 …]\n" -#~ "\n" -#~ "apt-cache Ă©s una eina de baix nivell emprada per a consultar\n" -#~ "la informaciĂ³ dels fitxers binaris de memĂ²ria cau de l'APT.\n" - -#~ msgid "" -#~ "Options:\n" -#~ " -h This help text.\n" -#~ " -p=? The package cache.\n" -#~ " -s=? The source cache.\n" -#~ " -q Disable progress indicator.\n" -#~ " -i Show only important deps for the unmet command.\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" -#~ msgstr "" -#~ "Opcions:\n" -#~ " -h Aquest text d'ajuda.\n" -#~ " -p=? La memĂ²ria cau de paquets.\n" -#~ " -s=? La memĂ²ria cau de la font.\n" -#~ " -q Inhabilita l'indicador de progrĂ©s.\n" -#~ " -i NomĂ©s mostra dependències importants amb l'opciĂ³ «unmet».\n" -#~ " -c=? Llegeix aquest fitxer de configuraciĂ³.\n" -#~ " -o=? Estableix una opciĂ³ de conf arbitrĂ ria, p. ex. -o dir::cache=/tmp\n" -#~ "Vegeu les pĂ gines de manual apt-cache(8) i apt.conf(5) per a mĂ©s " -#~ "informaciĂ³.\n" - -#~ msgid "" -#~ "Options:\n" -#~ " -h This help text.\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ msgstr "" -#~ "Opcions:\n" -#~ " -h Aquest text d'ajuda.\n" -#~ " -c=? Llegeix aquest fitxer de configuraciĂ³\n" -#~ " -o=? Estableix una opciĂ³ de conf arbitrĂ ria, p. ex. -o dir::cache=/tmp\n" - -#~ msgid "" -#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -#~ "\n" -#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is " -#~ "used\n" -#~ "to indicate what kind of file it is.\n" -#~ "\n" -#~ "Options:\n" -#~ " -h This help text\n" -#~ " -s Use source file sorting\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ msgstr "" -#~ "Forma d'Ăºs: apt-sortpkgs [opcions] fitxer1 [fitxer2 …]\n" -#~ "\n" -#~ "apt-sortpkgs Ă©s una eina simple per ordenar fitxers de paquets.\n" -#~ "L'opciĂ³ -s s'usa per a indicar quin tipus de fitxer Ă©s.\n" -#~ "\n" -#~ "Opcions:\n" -#~ " -h Aquest text d'ajuda.\n" -#~ " -s Empra l'ordenaciĂ³ de fitxers font\n" -#~ " -c=? Llegeix aquest fitxer de configuraciĂ³\n" -#~ " -o=? Estableix una opciĂ³ de configuraciĂ³, p. ex: -o dir::cache=/tmp\n" - -#~ msgid "Child process failed" -#~ msgstr "Ha fallat el procĂ©s fill" - -#, fuzzy -#~ msgid "Must specifc at least one srv record" -#~ msgstr "Haureu d'especificar un paquet de codi font per a baixar" - -#~ msgid "Failed to create pipes" -#~ msgstr "No es poden crear els conductes" - -#~ msgid "Failed to exec gzip " -#~ msgstr "No es pot executar el gzip " - -#~ msgid "%s %s for %s compiled on %s %s\n" -#~ msgstr "%s %s per a %s compilat el %s %s\n" - -#~ msgid "Failed to create FILE*" -#~ msgstr "No s'ha pogut crear FILE*" - -#, fuzzy -#~ msgid "Malformed stanza %u in source list %s (URI parse)" -#~ msgstr "LĂnia %lu malformada en la llista de fonts %s (analitzant URI)" - -#~ msgid "Malformed line %lu in source list %s ([option] unparseable)" -#~ msgstr "" -#~ "LĂnia %lu malformada en la llista de fonts %s ([opciĂ³] no reconeixible)" - -#~ msgid "Malformed line %lu in source list %s ([option] too short)" -#~ msgstr "LĂnia %lu malformada en la llista de fonts %s ([opciĂ³] massa curta)" - -#~ msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -#~ msgstr "" -#~ "LĂnia %lu malformada en la llista de fonts %s ([%s] no Ă©s una assignaciĂ³)" - -#~ msgid "Malformed line %lu in source list %s ([%s] has no key)" -#~ msgstr "LĂnia %lu malformada en la llista de fonts %s ([%s] no tĂ© clau)" - -#~ msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" -#~ msgstr "" -#~ "LĂnia %lu malformada en la llista de fonts %s ([%s] la clau %s no tĂ© " -#~ "valor)" - -#~ msgid "Malformed line %lu in source list %s (URI)" -#~ msgstr "LĂnia %lu malformada en la llista de fonts %s (URI)" - -#~ msgid "Malformed line %lu in source list %s (dist)" -#~ msgstr "LĂnia %lu malformada en la llista de fonts %s (dist)" - -#~ msgid "Malformed line %lu in source list %s (URI parse)" -#~ msgstr "LĂnia %lu malformada en la llista de fonts %s (analitzant URI)" - -#~ msgid "Malformed line %lu in source list %s (absolute dist)" -#~ msgstr "LĂnia %lu malformada en la llista de fonts %s (dist absoluta)" - -#~ msgid "Malformed line %lu in source list %s (dist parse)" -#~ msgstr "LĂnia %lu malformada en la llista de fonts %s (analitzant dist)" - -#~ msgid "Package %s %s was not found while processing file dependencies" -#~ msgstr "" -#~ "No s'ha trobat el paquet %s %s en processar les dependències del fitxer" - -#~ msgid "Couldn't stat source package list %s" -#~ msgstr "No s'ha pogut llegir la llista de paquets font %s" - -#~ msgid "Collecting File Provides" -#~ msgstr "S'estan recollint els fitxers que proveeixen" - -#, fuzzy -#~ msgid "Does not start with a cleartext signature" -#~ msgstr "El fitxer %s no comença amb un missatge signat en clar" - -#~ msgid "Unable to find hash sum for '%s' in Release file" -#~ msgstr "No s'ha trobat la suma de comprovaciĂ³ per a «%s» al fitxer Release" - -#~ msgid "Vendor block %s contains no fingerprint" -#~ msgstr "El camp del proveĂ¯dor %s no tĂ© una empremta digital" - -#~ msgid "Total dependency version space: " -#~ msgstr "Nombre total de l'espai per a dependències de versiĂ³: " - -#~ msgid "You don't have enough free space in %s" -#~ msgstr "No teniu prou espai lliure en %s" - -#~ msgid "Done" -#~ msgstr "Fet" - -#~ msgid "No keyring installed in %s." -#~ msgstr "No s'ha instaÅ€lat cap clauer a %s." - -#, fuzzy -#~ msgid "Internal error, Upgrade broke stuff" -#~ msgstr "Error intern, AllUpgrade ha trencat coses" - -#~ msgid "%s not a valid DEB package." -#~ msgstr "%s no Ă©s un paquet DEB vĂ lid." - -#~ msgid "" -#~ "Using CD-ROM mount point %s\n" -#~ "Mounting CD-ROM\n" -#~ msgstr "" -#~ "S'estĂ utilitzant el punt de muntatge de CD-ROM %s\n" -#~ "S'estĂ muntant el CD-ROM\n" - -#~ msgid "" -#~ "Could not patch %s with mmap and with file operation usage - the patch " -#~ "seems to be corrupt." -#~ msgstr "" -#~ "No s'ha pogut apedaçar %s amb el mmap ni amb la utilitzaciĂ³ de la " -#~ "operaciĂ³ del fitxer - el pedaç sembla ser incorrecte" - -#~ msgid "" -#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " -#~ "seems to be corrupt." -#~ msgstr "" -#~ "No s'ha pogut apedaçar %s amb el mmap (perĂ² no s'ha produĂ¯t un error " -#~ "especĂfic del mmap) - el pedaç sembla ser incorrecte" - -#~ msgid "Ignore unavailable target release '%s' of package '%s'" -#~ msgstr "Ignora la versiĂ³ objectiu «%s» no disponible del paquet «%s»" - -#~ msgid "Downloading %s %s" -#~ msgstr "S'estĂ baixant %s %s" - -#~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" -#~ msgstr "" -#~ "Aquest no Ă©s un arxiu DEB vĂ lid, li manca el membre «%s», «%s» o «%s»" - -#~ msgid "MD5Sum mismatch" -#~ msgstr "La suma MD5 no concorda" - -#~ msgid "" -#~ "I wasn't able to locate a file for the %s package. This might mean you " -#~ "need to manually fix this package." -#~ msgstr "" -#~ "No s'ha trobat un fitxer pel paquet %s. AixĂ² podria significar que haureu " -#~ "d'arreglar aquest paquet manualment." - -#~ msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" -#~ msgstr "" -#~ "No es pot escriure el registre, ha fallat openpty() (no s'ha muntat /dev/" -#~ "pts?)\n" - -#~ msgid "decompressor" -#~ msgstr "decompressor" - -#~ msgid "Failed to remove %s" -#~ msgstr "No es pot suprimir %s" - -#~ msgid "Unable to create %s" -#~ msgstr "No es pot crear %s" - -#~ msgid "Failed to stat %sinfo" -#~ msgstr "No s'ha pogut fer «stat» de %sinfo" - -#~ msgid "The info and temp directories need to be on the same filesystem" -#~ msgstr "" -#~ "La info i els directoris temp necessiten estar en el mateix sistema de " -#~ "fitxers" - -#~ msgid "Failed to change to the admin dir %sinfo" -#~ msgstr "No s'ha pogut canviar al directori d'administraciĂ³ %sinfo" - -#~ msgid "Internal error getting a package name" -#~ msgstr "S'ha produĂ¯t un error intern en obtenir un nom de paquet" - -#~ msgid "Reading file listing" -#~ msgstr "S'estĂ llegint el llistat de fitxers" - -#~ msgid "" -#~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " -#~ "then make it empty and immediately re-install the same version of the " -#~ "package!" -#~ msgstr "" -#~ "No s'ha pogut obrir la llista del fitxer «%sinfo/%s». Si no podeu " -#~ "restaurar aquest fitxer, creeu-lo buit i torneu a instaÅ€lar immediatament " -#~ "la mateixa versiĂ³ del paquet!" - -#~ msgid "Failed reading the list file %sinfo/%s" -#~ msgstr "No s'ha pogut llegir la llista del fitxer %sinfo/%s" - -#~ msgid "Internal error getting a node" -#~ msgstr "S'ha produĂ¯t un error en obtenir un node" - -#~ msgid "Failed to open the diversions file %sdiversions" -#~ msgstr "S'ha produĂ¯t un error en obrir el fitxer de desviaciĂ³ %sdiversions" - -#~ msgid "The diversion file is corrupted" -#~ msgstr "El fitxer de desviaciĂ³ estĂ corrupte" - -#~ msgid "Invalid line in the diversion file: %s" -#~ msgstr "LĂnia no vĂ lida al fitxer de desviaciĂ³: %s" - -#~ msgid "Internal error adding a diversion" -#~ msgstr "S'ha produĂ¯t un error intern en afegir una desviaciĂ³" - -#~ msgid "The pkg cache must be initialized first" -#~ msgstr "Primer s'ha d'inicialitzar la memĂ²ria cau d'aquest paquet" - -#~ msgid "Failed to find a Package: header, offset %lu" -#~ msgstr "No s'ha trobat una capçalera Package:, desplaçament %lu" - -#~ msgid "Bad ConfFile section in the status file. Offset %lu" -#~ msgstr "SecciĂ³ ConfFile dolenta al fitxer d'estat. Desplaçament %lu" - -#~ msgid "Error parsing MD5. Offset %lu" -#~ msgstr "S'ha produĂ¯t un error en analitzar la suma MD5. Desplaçament %lu" - -#~ msgid "Couldn't change to %s" -#~ msgstr "No s'ha pogut canviar a %s" - -#~ msgid "Internal error, could not locate member" -#~ msgstr "S'ha produĂ¯t un error intern, no s'ha trobat el membre" - -#~ msgid "Failed to locate a valid control file" -#~ msgstr "No s'ha trobat un fitxer de control vĂ lid" - -#~ msgid "Couldn't open pipe for %s" -#~ msgstr "No s'ha pogut obrir un conducte per a %s" - -#~ msgid "Read error from %s process" -#~ msgstr "S'ha produĂ¯t un error en llegir des del procĂ©s %s" - -#~ msgid "Got a single header line over %u chars" -#~ msgstr "S'ha obtingut una capçalera d'una sola lĂnea de mĂ©s de %u carĂ cters" - -#~ msgid "Internal error, group '%s' has no installable pseudo package" -#~ msgstr "" -#~ "S'ha produĂ¯t un error intern, el grup «%s» no disposa d'un pseudopaquet " -#~ "instaÅ€lable" - -#~ msgid "" -#~ "Could not perform immediate configuration on already unpacked '%s'. " -#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details." -#~ msgstr "" -#~ "No s'ha pogut realitzar la configuraciĂ³ immediata de «%s» ja " -#~ "desempaquetat. Vegeu man 5 apt.conf, sota APT::Immediate-Configure per a " -#~ "mĂ©s detalls." - -#~ msgid "Error occurred while processing %s (NewPackage)" -#~ msgstr "S'ha produĂ¯t un error durant el processament de %s (NewPackage)" - -#~ msgid "Error occurred while processing %s (UsePackage1)" -#~ msgstr "S'ha produĂ¯t un error durant el processament de %s (UsePackage1)" - -#~ msgid "Error occurred while processing %s (NewFileDesc1)" -#~ msgstr "S'ha produĂ¯t un error durant el processament de %s (NewFileDesc1)" - -#~ msgid "Error occurred while processing %s (UsePackage2)" -#~ msgstr "S'ha produĂ¯t un error durant el processament de %s (UsePackage2)" - -#~ msgid "Error occurred while processing %s (NewFileVer1)" -#~ msgstr "S'ha produĂ¯t un error durant el processament de %s (NewFileVer1)" - -#~ msgid "Error occurred while processing %s (NewVersion%d)" -#~ msgstr "S'ha produĂ¯t un error durant el processament de %s (NewVersion%d)" - -#~ msgid "Error occurred while processing %s (UsePackage3)" -#~ msgstr "S'ha produĂ¯t un error durant el processament de %s (UsePackage3)" - -#~ msgid "Error occurred while processing %s (NewFileDesc2)" -#~ msgstr "S'ha produĂ¯t un error durant el processament de %s (NewFileDesc2)" - -#~ msgid "Error occurred while processing %s (CollectFileProvides)" -#~ msgstr "" -#~ "S'ha produĂ¯t un error durant el processament de %s (CollectFileProvides)" - -#~ msgid "Release file expired, ignoring %s (invalid since %s)" -#~ msgstr "" -#~ "El fitxer Release ha caducat, s'estĂ ignorant %s (invĂ lid des de %s)" - -#~ msgid "Skipping nonexistent file %s" -#~ msgstr "S'estĂ ometent el fitxer %s que no existeix" - -#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -#~ msgstr "" -#~ "E: La llista d'arguments d'Acquire::gpgv::Options Ă©s massa llarga. S'estĂ " -#~ "sortint." - -#~ msgid "Error occurred while processing %s (NewVersion2)" -#~ msgstr "S'ha produĂ¯t un error durant el processament de %s (NewVersion2)" - -#~ msgid "Malformed line %u in source list %s (vendor id)" -#~ msgstr "" -#~ "La lĂnia %u Ă©s malformada en la llista de fonts %s (id del proveĂ¯dor)" - -#~ msgid "Couldn't access keyring: '%s'" -#~ msgstr "No s'ha pogut accedir a l'anell de claus: «%s»" - -#~ msgid "Could not patch file" -#~ msgstr "No s'ha pogut aplicar el pedaç al fitxer" - -#~ msgid " %4i %s\n" -#~ msgstr " %4i %s\n" - -#~ msgid "No source package '%s' picking '%s' instead\n" -#~ msgstr "No hi ha cap paquet font «%s», es selecciona «%s» en el seu lloc\n" - -#~ msgid "%4i %s\n" -#~ msgstr "%4i %s\n" - -#~ msgid "Processing triggers for %s" -#~ msgstr "S'estan processant els activadors per al paquet %s" - -#~ msgid "Dynamic MMap ran out of room" -#~ msgstr "L'MMap dinĂ mic s'ha quedat sense espai" - -#~ msgid "" -#~ "Since you only requested a single operation it is extremely likely that\n" -#~ "the package is simply not installable and a bug report against\n" -#~ "that package should be filed." -#~ msgstr "" -#~ "Degut a que nomĂ©s heu requerit una Ăºnica operaciĂ³, serĂ molt\n" -#~ "probable que el paquet no sigui instaÅ€lable i que s'hagi d'emetre\n" -#~ "un informe d'error en contra d'aquest per a arxivar-lo." - -#~ msgid "File date has changed %s" -#~ msgstr "La data del fitxer ha canviat %s" - -#~ msgid "Reading file list" -#~ msgstr "S'estĂ llegint la llista de fitxers" - -#~ msgid "Could not execute " -#~ msgstr "No s'ha pogut executar " - -#~ msgid "Preparing for remove with config %s" -#~ msgstr "S'estĂ preparant per a suprimir amb la configuraciĂ³ %s" - -#~ msgid "Removed with config %s" -#~ msgstr "S'ha suprimit amb la configuraciĂ³ %s" - -#~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -#~ msgstr "" -#~ "ID del proveĂ¯dor '%s' desconeguda en la lĂnia %u de la llista de fonts %s" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "Dependències sense satisfer. Proveu-ho emprant --fix-broken." -#~ msgid "" -#~ "Some broken packages were found while trying to process build-" -#~ "dependencies for %s.\n" -#~ "You might want to run 'apt-get -f install' to correct these." -#~ msgstr "" -#~ "S'han trobat alguns paquets trencats mentre es processaven les\n" -#~ "dependències de construcciĂ³ per a %s.\n" -#~ "Potser voldreu executar 'apt-get -f install' per a corregir-ho." +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "Potser voldreu executar «apt --fix-broken install» per corregir-ho:" @@ -1,14 +1,14 @@ # Czech translation of APT # This file is put in the public domain. -# Miroslav Kure <kurem@debian.cz>, 2004-2015. +# Miroslav Kure <kurem@debian.cz>, 2004-2017. # # msgid "" msgstr "" -"Project-Id-Version: apt 1.0.5\n" +"Project-Id-Version: apt 1.4.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-11-25 23:46+0100\n" -"PO-Revision-Date: 2015-08-29 15:24+0200\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" "Language: cs\n" @@ -192,28 +192,34 @@ msgid "" "Updating from such a repository can't be done securely, and is therefore " "disabled by default." msgstr "" +"Aktualizaci z takovĂ©ho repositĂ¡Å™e nelze provĂ©st zabezpeÄenÄ› a je proto " +"implicitnÄ› zakĂ¡zĂ¡na." #: apt-pkg/acquire-item.cc msgid "" "Data from such a repository can't be authenticated and is therefore " "potentially dangerous to use." msgstr "" +"Data z takovĂ©ho repositĂ¡Å™e nelze ověřit a proto je jejich použitĂ " +"potenciĂ¡lnÄ› nebezpeÄnĂ©." #: apt-pkg/acquire-item.cc msgid "" "See apt-secure(8) manpage for repository creation and user configuration " "details." msgstr "" +"Podrobnosti o vytvĂ¡Å™enĂ a nastavenĂ repositĂ¡Å™Å¯ naleznete v manuĂ¡lovĂ© strĂ¡nce " +"apt-secure(8)." #: apt-pkg/acquire-item.cc #, c-format msgid "The repository '%s' is no longer signed." -msgstr "RepositĂ¡Å™ â€%s“ nenĂ podepsĂ¡n." +msgstr "RepositĂ¡Å™ â€%s“ již nenĂ podepsĂ¡n." #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "The repository '%s' does no longer have a Release file." -msgstr "RepositĂ¡Å™ â€%s“ nenĂ podepsĂ¡n." +msgstr "RepositĂ¡Å™ â€%s“ již neobsahuje soubor Release." #: apt-pkg/acquire-item.cc msgid "" @@ -224,19 +230,19 @@ msgstr "" "AllowDowngradeToInsecureRepositories." #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "The repository '%s' is not signed." msgstr "RepositĂ¡Å™ â€%s“ nenĂ podepsĂ¡n." #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "The repository '%s' does not have a Release file." -msgstr "RepositĂ¡Å™ â€%s“ nenĂ podepsĂ¡n." +msgstr "RepositĂ¡Å™ â€%s“ neobsahuje soubor Release." #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "The repository '%s' provides only weak security information." -msgstr "RepositĂ¡Å™ â€%s“ nenĂ podepsĂ¡n." +msgstr "RepositĂ¡Å™ â€%s“ nabĂzĂ pouze slabĂ© zabezpeÄenĂ." #: apt-pkg/acquire-item.cc ftparchive/writer.cc #, c-format @@ -249,7 +255,7 @@ msgstr "Neshoda kontrolnĂch souÄtů" #: apt-pkg/acquire-item.cc msgid "Insufficient information available to perform this download securely" -msgstr "" +msgstr "Neexisuje dostatek informacĂ pro bezpeÄnĂ© staženĂ" #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc #, c-format @@ -299,6 +305,8 @@ msgid "" "Skipping acquire of configured file '%s' as repository '%s' doesn't support " "architecture '%s'" msgstr "" +"PÅ™eskakuje se staženĂ souboru â€%s“, protože repositĂ¡Å™ â€%s“ nepodporuje " +"architekturu â€%s“" #: apt-pkg/acquire-item.cc #, c-format @@ -315,6 +323,8 @@ msgid "" "Skipping acquire of configured file '%s' as repository '%s' provides only " "weak security information for it" msgstr "" +"PÅ™eskakuje se staženĂ souboru â€%s“, protože repositĂ¡Å™ â€%s“ o nÄ›m poskytuje " +"pouze slabĂ© bezpeÄnostnĂ informace" #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is #. the time since then the file is invalid - formatted in the same way as in @@ -363,12 +373,12 @@ msgstr "Seznam zmÄ›n pro %s=%s nenĂ dostupnĂ½" #: apt-pkg/acquire-worker.cc #, c-format msgid "The method '%s' is explicitly disabled via configuration." -msgstr "" +msgstr "Metoda â€%s“ je v nastavenĂ explicitnÄ› zakĂ¡zĂ¡na." #: apt-pkg/acquire-worker.cc methods/connect.cc #, c-format msgid "If you meant to use Tor remember to use %s instead of %s." -msgstr "" +msgstr "Jestliže jste chtÄ›li použĂt Tor, použijte %s namĂsto %s." #: apt-pkg/acquire-worker.cc #, c-format @@ -409,16 +419,16 @@ msgstr "Nelze uzamknout adresĂ¡Å™ %s" #: apt-pkg/acquire.cc #, c-format msgid "No sandbox user '%s' on the system, can not drop privileges" -msgstr "" +msgstr "V systĂ©mu neexistuje omezenĂ½ uživatel â€%s“, nelze se zbavit oprĂ¡vnÄ›nĂ" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" -"Pro staženĂ nelze zahodit oprĂ¡vnÄ›nĂ, jelikož soubor â€%s“ by nebyl pÅ™ĂstupnĂ½ " -"uživateli â€%s“." +"StaženĂ probĂhĂ¡ nechrĂ¡nÄ›nÄ› pod uživatelem root, jelikož soubor â€%s“ nebyl " +"pÅ™ĂstupnĂ½ uživateli â€%s“." #: apt-pkg/acquire.cc apt-pkg/clean.cc #, c-format @@ -832,7 +842,7 @@ msgstr "ProblĂ©m pÅ™i zavĂrĂ¡nĂ gzip souboru %s" #: apt-pkg/contrib/fileutl.cc msgid "Unexpected end of file" -msgstr "" +msgstr "NeoÄekĂ¡vanĂ½ konec souboru" #: apt-pkg/contrib/fileutl.cc msgid "Failed to create subprocess IPC" @@ -995,7 +1005,7 @@ msgstr "VĂ½bÄ›r %s nenalezen" #: apt-pkg/deb/debmetaindex.cc #, c-format msgid "Target %s wants to acquire the same file (%s) as %s from source %s" -msgstr "" +msgstr "CĂl %s chce stĂ¡hnout stejnĂ½ soubor (%s) jako %s ze zdroje %s" #. TRANSLATOR: an identifier like Packages; Releasefile key indicating #. a file like main/binary-amd64/Packages; filename and linenumber of @@ -1003,7 +1013,7 @@ msgstr "" #: apt-pkg/deb/debmetaindex.cc #, c-format msgid "Target %s (%s) is configured multiple times in %s and %s" -msgstr "" +msgstr "CĂl %s (%s) je nastaven vĂcekrĂ¡t v %s a %s" #: apt-pkg/deb/debmetaindex.cc #, c-format @@ -1026,6 +1036,8 @@ msgid "" "No Hash entry in Release file %s which is considered strong enough for " "security purposes" msgstr "" +"Release soubor %s neobsahuje Hash zĂ¡znam, kterĂ½ by byl pro bezpeÄnost " +"považovĂ¡n za dostateÄnÄ› silnĂ½" #: apt-pkg/deb/debmetaindex.cc #, c-format @@ -1044,9 +1056,9 @@ msgid "Invalid value set for option %s regarding source %s %s (%s)" msgstr "Pro volbu %s byla nastavena kolidujĂcĂ hodnota zdroje %s %s (%s)" #: apt-pkg/deb/debmetaindex.cc -#, fuzzy, c-format +#, c-format msgid "Conflicting values set for option %s regarding source %s %s: %s != %s" -msgstr "Pro volbu %s byly nastaveny kolidujĂcĂ hodnoty zdroje %s %s" +msgstr "Pro volbu %s byly nastaveny kolidujĂcĂ hodnoty zdroje %s %s: %s != %s" #: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc #, c-format @@ -1268,24 +1280,20 @@ msgid "Execute external solver" msgstr "SpuÅ¡tÄ›nĂ externĂho Å™eÅ¡itele" #: apt-pkg/edsp.cc -#, fuzzy msgid "Execute external planner" -msgstr "SpuÅ¡tÄ›nĂ externĂho Å™eÅ¡itele" +msgstr "SpuÅ¡tÄ›nĂ externĂho plĂ¡novaÄe" #: apt-pkg/edsp.cc -#, fuzzy msgid "Send request to planner" -msgstr "Požadavek odeslĂ¡n Å™eÅ¡iteli" +msgstr "Požadavek odeslĂ¡n plĂ¡novaÄi" #: apt-pkg/edsp.cc -#, fuzzy msgid "Send scenario to planner" -msgstr "ScĂ©nĂ¡Å™ odeslĂ¡n Å™eÅ¡iteli" +msgstr "ScĂ©nĂ¡Å™ odeslĂ¡n plĂ¡novaÄi" #: apt-pkg/edsp.cc -#, fuzzy msgid "External planner failed without a proper error message" -msgstr "ExternĂ Å™eÅ¡itel selhal, aniž by zanechal rozumnou chybovou hlĂ¡Å¡ku" +msgstr "ExternĂ plĂ¡novaÄ selhal, aniž by zanechal rozumnou chybovou hlĂ¡Å¡ku" #: apt-pkg/indexcopy.cc #, c-format @@ -1384,9 +1392,8 @@ msgid "The package cache was built for different architectures: %s vs %s" msgstr "Cache balĂků byla vytvoÅ™ena pro jinou architekturu: %s vs %s" #: apt-pkg/pkgcache.cc -#, fuzzy msgid "The package cache file is corrupted, it has the wrong hash" -msgstr "Cache soubor balĂků je poÅ¡kozen, je pÅ™ĂliÅ¡ malĂ½" +msgstr "Cache soubor balĂků je poÅ¡kozen, kontrolnĂ souÄet nesouhlasĂ" #: apt-pkg/pkgcache.cc msgid "Depends" @@ -1546,16 +1553,16 @@ msgstr "Typ â€%s“ v ÄĂ¡sti %u v seznamu zdrojů %s nenĂ znĂ¡mĂ½" #: apt-pkg/sourcelist.cc #, c-format msgid "Unsupported file %s given on commandline" -msgstr "" +msgstr "ZadĂ¡n nepodporovanĂ½ soubor %s" #: apt-pkg/srcrecords.cc msgid "You must put some 'source' URIs in your sources.list" msgstr "Do sources.list musĂte zadat â€zdrojovĂ©â€œ URI" #: apt-pkg/tagfile.cc -#, fuzzy, c-format +#, c-format msgid "Cannot convert %s to integer: out of range" -msgstr "Nelze pÅ™evĂ©st %s na celĂ© ÄĂslo (integer)" +msgstr "Nelze pÅ™evĂ©st %s na celĂ© ÄĂslo: mimo rozsah" #: apt-pkg/update.cc apt-private/private-download.cc #, c-format @@ -1641,13 +1648,17 @@ msgstr "Nelze minimalizovat sadu pro aktualizaci" msgid " Done" msgstr " Hotovo" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Pro opravenĂ můžete spustit â€apt-get -f install“." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "Pro opravenĂ můžete spustit â€apt --fix-broken install“." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "NesplnÄ›nĂ© zĂ¡vislosti. Zkuste použĂt -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"NesplnÄ›nĂ© zĂ¡vislosti. Zkuste spustit â€apt --fix-broken install“ bez balĂků " +"(nebo navrhnÄ›te Å™eÅ¡enĂ)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1729,12 +1740,12 @@ msgstr "Pozn: VybĂrĂ¡m â€%s“ mĂsto â€%s“\n" #: apt-private/private-cmndline.cc msgid "Most used commands:" -msgstr "" +msgstr "NejpoužĂvanÄ›jÅ¡Ă pÅ™Ăkazy:" #: apt-private/private-cmndline.cc #, c-format msgid "See %s for more information about the available commands." -msgstr "" +msgstr "VĂce informacĂ o dostupnĂ½ch pÅ™Ăkazech naleznete v %s." #: apt-private/private-cmndline.cc msgid "" @@ -1743,6 +1754,10 @@ msgid "" "Package and version choices can be expressed via apt_preferences(5).\n" "Security details are available in apt-secure(8).\n" msgstr "" +"KonfiguraÄnĂ volby a syntaxe jsou popsĂ¡ny v apt.conf(5).\n" +"Informace o nastavenĂ zdrojů se nachĂ¡zĂ v sources.list(5).\n" +"VĂ½bÄ›r balĂků a verzĂ je možno vyjĂ¡dÅ™it pomocĂ apt_preferences(5).\n" +"Podrobnosti o zabezpeÄenĂ jsou dostupnĂ© v apt-secure(8).\n" #: apt-private/private-cmndline.cc msgid "This APT has Super Cow Powers." @@ -1774,7 +1789,6 @@ msgid "Install these packages without verification?" msgstr "Instalovat tyto balĂky bez ověřenĂ?" #: apt-private/private-download.cc apt-private/private-install.cc -#, fuzzy msgid "" "--force-yes is deprecated, use one of the options starting with --allow " "instead." @@ -1832,6 +1846,14 @@ msgid "Broken packages" msgstr "PoÅ¡kozenĂ© balĂky" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Nelze stĂ¡hnout nÄ›kterĂ© archivy. MožnĂ¡ spusÅ¥te apt-get update nebo zkuste --" +"fix-missing?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "VnitÅ™nĂ chyba, InstallPackages byl zavolĂ¡n s poruÅ¡enĂ½mi balĂky!" @@ -1934,14 +1956,6 @@ msgid "Download complete and in download only mode" msgstr "StahovĂ¡nĂ dokonÄeno v režimu pouze stĂ¡hnout" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Nelze stĂ¡hnout nÄ›kterĂ© archivy. MožnĂ¡ spusÅ¥te apt-get update nebo zkuste --" -"fix-missing?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a vĂ½mÄ›na mĂ©dia nejsou momentĂ¡lnÄ› podporovĂ¡ny" @@ -2020,18 +2034,6 @@ msgstr[1] "Pro jejich odstranÄ›nĂ použijte â€%s“." msgstr[2] "Pro jejich odstranÄ›nĂ použijte â€%s“." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Pro opravenĂ nĂ¡sledujĂcĂch můžete spustit â€apt-get -f install“:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"NesplnÄ›nĂ© zĂ¡vislosti. Zkuste spustit â€apt-get -f install“ bez balĂků (nebo " -"navrhnÄ›te Å™eÅ¡enĂ)." - -#: apt-private/private-install.cc msgid "The following additional packages will be installed:" msgstr "NĂ¡sledujĂcĂ dodateÄnĂ© balĂky budou instalovĂ¡ny:" @@ -2419,7 +2421,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "PÅ™Ăkaz pro rozbalenĂ â€%s“ selhal.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Zkontrolujte, zda je nainstalovĂ¡n balĂk â€dpkg-dev“.\n" @@ -2586,6 +2587,15 @@ msgid "" "too long ago, but in exchange apt-cache works independently of the\n" "availability of the configured sources (e.g. offline).\n" msgstr "" +"PoužitĂ: apt-cache [volby] pÅ™Ăkaz\n" +" apt-cache [volby] show balĂk1 [balĂk2 …]\n" +"\n" +"apt-cache dotazuje a zobrazuje dostupnĂ© informace o instalovanĂ½ch\n" +"a instalovatelnĂ½ch balĂcĂch. Pracuje pouze s lokĂ¡lnĂmi daty zĂskanĂ½mi\n" +"pÅ™Ăkazem â€update“ napÅ™. programu apt-get. ZobrazenĂ© informace tedy\n" +"mohou bĂ½t zastaralĂ© (pokud poslednĂ aktualizace probÄ›hla dĂ¡vnÄ›ji),\n" +"ale zato apt-cache pracuje nezĂ¡visle na dostupnosti nastavenĂ½ch\n" +"zdrojů (napÅ™. offline).\n" #: cmdline/apt-cache.cc msgid "Show source records" @@ -2651,13 +2661,17 @@ msgid "" "media types as package sources to APT. The mount point and device\n" "information is taken from apt.conf(5), udev(7) and fstab(5).\n" msgstr "" +"PoužitĂ: apt-cdrom [volby] pÅ™Ăkaz\n" +"\n" +"apt-cdrom se použĂvĂ¡ pro pÅ™idĂ¡nĂ CD, USB klĂÄenek a jinĂ½ch\n" +"vyjĂmatelnĂ½ch mĂ©diĂ jako zdrojů pro APT. PÅ™ĂpojnĂ½ bod a informace\n" +"o zaÅ™ĂzenĂ se zĂskĂ¡vĂ¡ z apt.conf(5), udev(7) a fstab(5).\n" #: cmdline/apt-config.cc msgid "Arguments not in pairs" msgstr "Argumenty nejsou v pĂ¡rech" #: cmdline/apt-config.cc -#, fuzzy msgid "" "Usage: apt-config [options] command\n" "\n" @@ -2666,15 +2680,16 @@ msgid "" msgstr "" "PoužitĂ: apt-config [volby] pÅ™Ăkaz\n" "\n" -"apt-config je jednoduchĂ½ nĂ¡stroj pro ÄtenĂ konfiguraÄnĂho souboru APT\n" +"apt-config je jednoduchĂ½ nĂ¡stroj pro nastavenĂ voleb použĂvanĂ½ch vÅ¡emi\n" +"nĂ¡stroji rodiny APT. PÅ™evĂ¡Å¾nÄ› je zamĂ½Å¡len pro ladÄ›nĂ a skriptovĂ¡nĂ.\n" #: cmdline/apt-config.cc msgid "get configuration values via shell evaluation" -msgstr "" +msgstr "zĂskĂ¡ nastavenĂ pÅ™es shellovĂ© vyhodnocovĂ¡nĂ" #: cmdline/apt-config.cc msgid "show the active configuration setting" -msgstr "" +msgstr "zobrazĂ aktuĂ¡lnÄ› platnĂ© nastavenĂ" #: cmdline/apt-dump-solver.cc msgid "" @@ -2683,9 +2698,12 @@ msgid "" "apt-dump-solver is an interface to store an EDSP scenario in\n" "a file and optionally forwards it to another solver.\n" msgstr "" +"PoužitĂ: apt-dump-solver\n" +"\n" +"apt-dump-solver slouÅ¾Ă pro uloženĂ EDSP scĂ©nĂ¡Å™e do\n" +"souboru a pÅ™ĂpadnĂ©mu pÅ™eposlĂ¡nĂ jinĂ©mu Å™eÅ¡iteli.\n" #: cmdline/apt-extracttemplates.cc -#, fuzzy msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -2695,13 +2713,9 @@ msgid "" msgstr "" "PoužitĂ: apt-extracttemplates soubor1 [soubor2 …]\n" "\n" -"apt-extracttemplates umĂ z balĂků vytĂ¡hnout konfiguraÄnĂ skripty a Å¡ablony\n" -"\n" -"Volby:\n" -" -h Tato nĂ¡povÄ›da.\n" -" -t NastavĂ doÄasnĂ½ adresĂ¡Å™\n" -" -c=? NaÄte tento konfiguraÄnĂ soubor\n" -" -o=? NastavĂ libovolnou volbu, napÅ™. -o dir::cache=/tmp\n" +"apt-extracttemplates umĂ z balĂků vytĂ¡hnout konfiguraÄnĂ skripty\n" +"a Å¡ablony. VyužĂvĂ¡ ho hlavnÄ› debconf(1) pro zobrazenĂ nÄ›kterĂ½ch\n" +"otĂ¡zek jeÅ¡tÄ› pÅ™ed samotnou instalacĂ balĂků.\n" #: cmdline/apt-extracttemplates.cc msgid "Cannot get debconf version. Is debconf installed?" @@ -2734,7 +2748,6 @@ msgid "Supported modules:" msgstr "PodporovanĂ© moduly:" #: cmdline/apt-get.cc -#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -2749,8 +2762,9 @@ msgstr "" " apt-get [volby] install|remove balĂk1 [balĂk2 …]\n" " apt-get [volby] source balĂk1 [balĂk2 …]\n" "\n" -"apt-get je jednoduchĂ© Å™Ă¡dkovĂ© rozhranĂ pro stahovĂ¡nĂ a instalovĂ¡nĂ\n" -"balĂků. NejpoužĂvanÄ›jÅ¡Ă pÅ™Ăkazy jsou update a install.\n" +"apt-get je Å™Ă¡dkovĂ© rozhranĂ pro stahovĂ¡nĂ balĂků a informacĂ o nich\n" +"z ověřenĂ½ch zdrojů a pro instalaci, aktualizaci a odstranÄ›nĂ balĂků\n" +"vÄetnÄ› jejich zĂ¡vislostĂ.\n" #: cmdline/apt-get.cc msgid "Retrieve new lists of packages" @@ -2830,7 +2844,6 @@ msgid "GetSrvRec failed for %s" msgstr "GetSrvRec %s selhalo" #: cmdline/apt-helper.cc -#, fuzzy msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] cat-file file ...\n" @@ -2840,9 +2853,12 @@ msgid "" "e.g. the same proxy configuration or acquire system as APT would.\n" msgstr "" "PoužitĂ: apt-helper [volby] pÅ™Ăkaz\n" +" apt-helper [volby] cat-file soubor\n" " apt-helper [volby] download-file uri cĂlovĂ¡_cesta\n" "\n" -"apt-helper je internĂ pomocnĂk pro apt\n" +"apt-helper zaobaluje nejrůznÄ›jÅ¡Ă pÅ™Ăkazy pro shellovĂ© skripty,\n" +"napÅ™. aby použily stejnĂ© nastavenĂ proxy nebo způsob stahovĂ¡nĂ,\n" +"jako by použila APT.\n" #: cmdline/apt-helper.cc msgid "download the given uri to the target-path" @@ -2854,14 +2870,13 @@ msgstr "vyhledĂ¡ SRV zĂ¡znam (napÅ™. _http._tcp.ftp.debian.org)" #: cmdline/apt-helper.cc msgid "concatenate files, with automatic decompression" -msgstr "" +msgstr "spojĂ soubory, automaticky je rozbalĂ" #: cmdline/apt-helper.cc msgid "detect proxy using apt.conf" msgstr "detekuje proxy pomocĂ apt.conf" #: cmdline/apt-internal-planner.cc -#, fuzzy msgid "" "Usage: apt-internal-planner\n" "\n" @@ -2869,19 +2884,12 @@ msgid "" "installation planner for the APT family like an external one,\n" "for debugging or the like.\n" msgstr "" -"PoužitĂ: apt-internal-solver\n" -"\n" -"apt-internal-solver je rozhranĂ k aktuĂ¡lnĂmu internĂmu Å™eÅ¡iteli\n" -"zĂ¡vislostĂ, jako by Å¡lo o externĂ nĂ¡stroj - vhodnĂ© pro ladÄ›nĂ\n" +"PoužitĂ: apt-internal-planner\n" "\n" -"Volby:\n" -" -h Tato nĂ¡povÄ›da.\n" -" -q NezobrazĂ indikĂ¡tor postupu - vhodnĂ© pro zĂ¡znam\n" -" -c=? NaÄte danĂ½ konfiguraÄnĂ soubor\n" -" -o=? NastavĂ libovolnou volbu, napÅ™. -o dir::cache=/tmp\n" +"apt-internal-planner je rozhranĂ k aktuĂ¡lnĂmu internĂmu plĂ¡novaÄi\n" +"instalacĂ, aby se dal použĂt jako externĂ nĂ¡stroj, napÅ™. pro ladÄ›nĂ.\n" #: cmdline/apt-internal-solver.cc -#, fuzzy msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2892,13 +2900,7 @@ msgstr "" "PoužitĂ: apt-internal-solver\n" "\n" "apt-internal-solver je rozhranĂ k aktuĂ¡lnĂmu internĂmu Å™eÅ¡iteli\n" -"zĂ¡vislostĂ, jako by Å¡lo o externĂ nĂ¡stroj - vhodnĂ© pro ladÄ›nĂ\n" -"\n" -"Volby:\n" -" -h Tato nĂ¡povÄ›da.\n" -" -q NezobrazĂ indikĂ¡tor postupu - vhodnĂ© pro zĂ¡znam\n" -" -c=? NaÄte danĂ½ konfiguraÄnĂ soubor\n" -" -o=? NastavĂ libovolnou volbu, napÅ™. -o dir::cache=/tmp\n" +"zĂ¡vislostĂ, aby se dal použĂt jako externĂ nĂ¡stroj, napÅ™. pro ladÄ›nĂ.\n" #: cmdline/apt-mark.cc #, c-format @@ -2942,20 +2944,19 @@ msgstr "PodrženĂ balĂku %s v aktuĂ¡lnĂ verzi bylo zruÅ¡eno.\n" #: cmdline/apt-mark.cc #, c-format msgid "Selected %s for purge.\n" -msgstr "" +msgstr "%s byl vybrĂ¡n pro odstranÄ›nĂ vÄetnÄ› konfguraÄnĂch souborů.\n" #: cmdline/apt-mark.cc #, c-format msgid "Selected %s for removal.\n" -msgstr "" +msgstr "%s byl vybrĂ¡n pro odstranÄ›nĂ.\n" #: cmdline/apt-mark.cc #, c-format msgid "Selected %s for installation.\n" -msgstr "" +msgstr "%s byl vybrĂ¡n pro instalaci.\n" #: cmdline/apt-mark.cc -#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -2967,7 +2968,8 @@ msgstr "" "PoužitĂ: apt-mark [volby] {auto|manual} balĂk1 [balĂk2 …]\n" "\n" "apt-mark je jednoduchĂ© Å™Ă¡dkovĂ© rozhranĂ pro oznaÄovĂ¡nĂ balĂků jako\n" -"instalovanĂ½ch ruÄnÄ› nebo automaticky. TakĂ© umĂ tyto znaÄky vypsat.\n" +"instalovanĂ½ch ruÄnÄ› nebo automaticky. TakĂ© umĂ manipulovat s dpkg(1)\n" +"stavem balĂků a vypsat vÅ¡echny balĂky s/bez konkrĂ©tnĂho oznaÄenĂ.\n" #: cmdline/apt-mark.cc msgid "Mark the given packages as automatically installed" @@ -3009,6 +3011,11 @@ msgid "" "By default it sorts by binary package information, but the -s option\n" "can be used to switch to source package ordering instead.\n" msgstr "" +"PoužtĂ: apt-sortpkgs [volby] soubor1 [soubor2 …]\n" +"\n" +"apt-sortpkgs je jednoduchĂ½ nĂ¡stroj pro setÅ™ĂdÄ›nĂ souborů Packages.\n" +"StandardnÄ› Å™adĂ dle binĂ¡rnĂch balĂků, ale volbou -s je možno\n" +"pÅ™epnout na Å™azenĂ dle zdrojovĂ½ch balĂků.\n" #: cmdline/apt.cc msgid "" @@ -3020,6 +3027,12 @@ msgid "" "like apt-get and apt-cache, but enables options more suitable for\n" "interactive use by default.\n" msgstr "" +"PoužitĂ: apt [volby] pÅ™Ăkaz\n" +"\n" +"apt je Å™Ă¡dkovĂ½ sprĂ¡vce balĂků a poskytuje pÅ™Ăkazy pro jejich hledĂ¡nĂ,\n" +"sprĂ¡vu a takĂ© pro zjiÅ¡Å¥ovĂ¡nĂ informacĂ o balĂcĂch.\n" +"Poskytuje stejnou funkcionalitu jako specializovanĂ© APT nĂ¡stroje typu\n" +"apt-get a apt-cache, ale je lĂ©pe nastaven pro interaktivnĂ použitĂ.\n" #. query #: cmdline/apt.cc @@ -3386,6 +3399,55 @@ msgstr " %s nemĂ¡ Å¾Ă¡dnou zdrojovou položku pro override\n" msgid " %s has no binary override entry either\n" msgstr " %s nemĂ¡ ani Å¾Ă¡dnou binĂ¡rnĂ položku pro override\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "ÄŒekĂ¡ se na hlaviÄky" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "Http server poslal neplatnou hlaviÄku odpovÄ›di" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "ChybnĂ¡ hlaviÄka" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "Http server poslal neplatnou hlaviÄku Content-Length" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "Http server poslal neplatnou hlaviÄku Content-Range" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Tento HTTP server mĂ¡ porouchanou podporu rozsahů" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "NeznĂ¡mĂ½ formĂ¡t data" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Å patnĂ© datovĂ© zĂ¡hlavĂ" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "SpojenĂ selhalo" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" +"Automaticky zakĂ¡zĂ¡no %s kvůli chybnĂ© odpovÄ›di od serveru/proxy. (man 5 apt." +"conf)" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "VnitÅ™nĂ chyba" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3420,7 +3482,7 @@ msgstr "Soubor nebyl nalezen" #: methods/connect.cc #, c-format msgid "Direct connection to %s domains is blocked by default." -msgstr "" +msgstr "PÅ™ĂmĂ© spojenĂ k domĂ©nĂ¡m %s je implicitnÄ› blokovĂ¡no." #: methods/connect.cc methods/http.cc #, c-format @@ -3637,7 +3699,7 @@ msgstr "Nelze vyvolat " #. TRANSLATORS: %s is a single techy word like 'NODATA' #: methods/gpgv.cc -#, fuzzy, c-format +#, c-format msgid "" "Signed file isn't valid, got '%s' (does the network require authentication?)" msgstr "" @@ -3665,7 +3727,7 @@ msgstr "NeznĂ¡mĂ¡ chyba pÅ™i spouÅ¡tÄ›nĂ apt-key" #: methods/gpgv.cc #, c-format msgid "Signature by key %s uses weak digest algorithm (%s)" -msgstr "" +msgstr "Podpis klĂÄem %s použĂvĂ¡ slabĂ½ algoritmus (%s)" #: methods/gpgv.cc msgid "The following signatures were invalid:\n" @@ -3739,59 +3801,17 @@ msgstr "Nelze nastavit Äas modifikace" msgid "Connection closed prematurely" msgstr "SpojenĂ bylo pÅ™edÄasnÄ› ukonÄeno" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "ÄŒekĂ¡ se na hlaviÄky" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "Http server poslal neplatnou hlaviÄku odpovÄ›di" - -#: methods/server.cc -msgid "Bad header line" -msgstr "ChybnĂ¡ hlaviÄka" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Http server poslal neplatnou hlaviÄku Content-Length" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Http server poslal neplatnou hlaviÄku Content-Range" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Tento HTTP server mĂ¡ porouchanou podporu rozsahů" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "NeznĂ¡mĂ½ formĂ¡t data" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Å patnĂ© datovĂ© zĂ¡hlavĂ" - -#: methods/server.cc -msgid "Connection failed" -msgstr "SpojenĂ selhalo" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" -"Automaticky zakĂ¡zĂ¡no %s kvůli chybnĂ© odpovÄ›di od serveru/proxy. (man 5 apt." -"conf)" - -#: methods/server.cc -msgid "Internal error" -msgstr "VnitÅ™nĂ chyba" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "PrĂ¡zdnĂ© soubory nejsou platnĂ½mi archivy" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "NesplnÄ›nĂ© zĂ¡vislosti. Zkuste použĂt --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "Pro opravenĂ nĂ¡sledujĂcĂch můžete spustit â€apt --fix-broken install“:" + #~ msgid "(not found)" #~ msgstr "(nenalezeno)" @@ -3801,10 +3821,6 @@ msgstr "PrĂ¡zdnĂ© soubory nejsou platnĂ½mi archivy" #~ msgid "There is no public key available for the following key IDs:\n" #~ msgstr "K nĂ¡sledujĂcĂm ID klĂÄů nenĂ dostupnĂ½ veÅ™ejnĂ½ klĂÄ:\n" -#, fuzzy -#~ msgid "The repository is insufficiently signed by key %s (%s)" -#~ msgstr "RepositĂ¡Å™ â€%s“ nenĂ podepsĂ¡n." - #~ msgid "" #~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " #~ "packages" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -415,8 +415,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1637,13 +1637,19 @@ msgstr "Ni ellir bychanu y set uwchraddio" msgid " Done" msgstr " Wedi Gorffen" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "" +"Efallai hoffech rhedeg 'apt --fix-broken install' er mwyn cywiro'r rhain." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." +# FIXME +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt --fix-broken install' efo " +"dim pecyn (neu penodwch ddatrys)" #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1833,6 +1839,14 @@ msgid "Broken packages" msgstr "Pecynnau wedi torri" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " +"geidio defnyddio --fix-missing?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" @@ -1934,14 +1948,6 @@ msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " -"geidio defnyddio --fix-missing?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd" @@ -2009,19 +2015,6 @@ msgstr[0] "" msgstr[1] "" #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:" - -# FIXME -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim " -"pecyn (neu penodwch ddatrys)" - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" @@ -2409,7 +2402,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" @@ -3403,6 +3395,58 @@ msgstr " Does dim cofnod gwrthwneud gan %s\n" msgid " %s has no binary override entry either\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Yn aros am benawdau" + +#: methods/basehttp.cc +#, fuzzy +msgid "The HTTP server sent an invalid reply header" +msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Llinell pennawd gwael" + +#: methods/basehttp.cc +#, fuzzy +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" + +#: methods/basehttp.cc +#, fuzzy +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" + +#: methods/basehttp.cc +#, fuzzy +msgid "This HTTP server has broken range support" +msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Fformat dyddiad anhysbys" + +#: methods/basehttp.cc +#, fuzzy +msgid "Bad header data" +msgstr "Data pennawd gwael" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Methodd y cysylltiad" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Gwall mewnol" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3762,62 +3806,17 @@ msgstr "Methwyd gosod amser newid" msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Yn aros am benawdau" - -#: methods/server.cc -#, fuzzy -msgid "The HTTP server sent an invalid reply header" -msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Llinell pennawd gwael" - -#: methods/server.cc -#, fuzzy -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" - -#: methods/server.cc -#, fuzzy -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" - -#: methods/server.cc -#, fuzzy -msgid "This HTTP server has broken range support" -msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Fformat dyddiad anhysbys" - -#: methods/server.cc -#, fuzzy -msgid "Bad header data" -msgstr "Data pennawd gwael" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Methodd y cysylltiad" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Gwall mewnol" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "Efallai hoffech rhedeg 'apt --fix-broken install' er mwyn cywiro'r rhain:" + #~ msgid "(not found)" #~ msgstr "(heb ganfod)" @@ -2,16 +2,18 @@ # Copyright (C) 2014 apt & nedenstĂ¥ende oversættere. # This file is distributed under the same license as the apt package. # Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2002, 2003, 2004, 2005, 2006, 2007. -# Joe Hansen <joedalton2@yahoo.dk>, 2010, 2012, 2013, 2014. +# Joe Hansen <joedalton2@yahoo.dk>, 2010, 2012, 2013, 2014, 2017. # +# checksum -> kontrolsum +# signature -> signatur (bemærk at den ikke er underskrift i den her). # solver -> problemløser # msgid "" msgstr "" -"Project-Id-Version: apt 1.0.5\n" +"Project-Id-Version: apt 1.4~rc2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-11-25 23:46+0100\n" -"PO-Revision-Date: 2014-07-06 23:51+0200\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" "Language: da\n" @@ -46,9 +48,9 @@ msgid "Failed to read the archive headers" msgstr "Kunne ikke læse arkivhovederne" #: apt-inst/contrib/extracttar.cc -#, fuzzy, c-format +#, c-format msgid "Cannot find a configured compressor for '%s'" -msgstr "Kan ikke finde godkendelsesregistrering for: %s" +msgstr "Kan ikke finde konfigureret komprimeringsprogram for »%s«" #: apt-inst/contrib/extracttar.cc msgid "Corrupted archive" @@ -56,7 +58,7 @@ msgstr "Ă˜delagt arkiv" #: apt-inst/contrib/extracttar.cc msgid "Tar checksum failed, archive corrupted" -msgstr "Tar-tjeksum fejlede, arkivet er ødelagt" +msgstr "Tar-kontrolsum fejlede, arkivet er ødelagt" #: apt-inst/contrib/extracttar.cc #, c-format @@ -195,49 +197,57 @@ msgid "" "Updating from such a repository can't be done securely, and is therefore " "disabled by default." msgstr "" +"Opdatering, fra et sĂ¥dant arkiv, kan ikke udføres sikkert og er derfor " +"deaktiveret som standard." #: apt-pkg/acquire-item.cc msgid "" "Data from such a repository can't be authenticated and is therefore " "potentially dangerous to use." msgstr "" +"Data, fra et sĂ¥dant arkiv, kan ikke godkendes og er derfor potentielt farlig " +"at anvende." #: apt-pkg/acquire-item.cc msgid "" "See apt-secure(8) manpage for repository creation and user configuration " "details." msgstr "" +"Se apt-secure(8)-manualsiden for detaljer om arkivoprettelse og " +"brugerkonfiguration." #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "The repository '%s' is no longer signed." -msgstr "Mappen %s er omrokeret" +msgstr "Arkivet »%s« er ikke længere underskrevet." #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "The repository '%s' does no longer have a Release file." -msgstr "Mappen %s er omrokeret" +msgstr "Arkivet »%s« har ikke længere en udgivelsesfil." #: apt-pkg/acquire-item.cc msgid "" "This is normally not allowed, but the option Acquire::" "AllowDowngradeToInsecureRepositories was given to override it." msgstr "" +"Dette er normalt ikke tilladt, men tilvalget Acquire::" +"AllowDowngradeToInsecureRepositories blev angivet for at overskrive." #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "The repository '%s' is not signed." -msgstr "Mappen %s er omrokeret" +msgstr "Arkivet »%s« er ikke underskrevet." #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "The repository '%s' does not have a Release file." -msgstr "Mappen %s er omrokeret" +msgstr "Arkivet »%s« har ikke en udgivelsesfil." #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "The repository '%s' provides only weak security information." -msgstr "Mappen %s er omrokeret" +msgstr "Arkivet »%s« tilbyder kun svag sikkerhedsinformation." #: apt-pkg/acquire-item.cc ftparchive/writer.cc #, c-format @@ -251,6 +261,8 @@ msgstr "Hashsum stemmer ikke" #: apt-pkg/acquire-item.cc msgid "Insufficient information available to perform this download securely" msgstr "" +"Utilstrækkelig information er tilgængelig for at udføre denne overførsel " +"sikkert" #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc #, c-format @@ -266,9 +278,8 @@ msgid "Invalid file format" msgstr "Ugyldigt filformat" #: apt-pkg/acquire-item.cc -#, fuzzy msgid "Signature error" -msgstr "Skrivefejl" +msgstr "Signaturfejl" #. TRANSLATORS: %s is a single techy word like 'NODATA' #: apt-pkg/acquire-item.cc methods/gpgv.cc @@ -281,13 +292,13 @@ msgstr "" "autentificering?)" #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "" "An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s" msgstr "" -"Der opstod en fejl under underskriftsbekræftelse. Arkivet er ikke opdateret " -"og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n" +"Der opstod en fejl under signaturbekræftelse. Arkivet er ikke opdateret og " +"den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) #: apt-pkg/acquire-item.cc @@ -301,6 +312,8 @@ msgid "" "Skipping acquire of configured file '%s' as repository '%s' doesn't support " "architecture '%s'" msgstr "" +"Udelader erhvervelse af konfigureret fil »%s«, da arkivet »%s« ikke " +"understøtter arkitekturen »%s«" #: apt-pkg/acquire-item.cc #, c-format @@ -317,6 +330,8 @@ msgid "" "Skipping acquire of configured file '%s' as repository '%s' provides only " "weak security information for it" msgstr "" +"Udelader erhvervelse af konfigureret fil »%s«, da arkivet »%s« kun tilbyder " +"svag sikkerhedsinformation" #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is #. the time since then the file is invalid - formatted in the same way as in @@ -357,19 +372,19 @@ msgstr "Pakkeindeksfilerne er i stykker. Intet »Filename:«-felt for pakken %s. #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1 #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "Changelog unavailable for %s=%s" -msgstr "Ændringslog for %s (%s)" +msgstr "Ændringslog utilgængelig for %s=%s" #: apt-pkg/acquire-worker.cc #, c-format msgid "The method '%s' is explicitly disabled via configuration." -msgstr "" +msgstr "Metoden »%s« er eksplicit deaktiveret via konfiguration." #: apt-pkg/acquire-worker.cc methods/connect.cc #, c-format msgid "If you meant to use Tor remember to use %s instead of %s." -msgstr "" +msgstr "Hvis du ønskede at bruge Tor sĂ¥ husk at bruge %s i stedet for %s." #: apt-pkg/acquire-worker.cc #, c-format @@ -387,10 +402,10 @@ msgid "Method %s did not start correctly" msgstr "Metoden %s startede ikke korrekt" #: apt-pkg/acquire-worker.cc -#, fuzzy, c-format +#, c-format msgid "" "Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]." -msgstr "Indsæt disken med navnet: »%s« i drevet »%s« og tryk retur." +msgstr "Indsæt venligst disken med navnet: »%s« i drevet »%s« og tryk [Retur]." #: apt-pkg/acquire.cc apt-pkg/cdrom.cc #, c-format @@ -410,19 +425,21 @@ msgstr "Kunne ikke lĂ¥se mappen %s" #: apt-pkg/acquire.cc #, c-format msgid "No sandbox user '%s' on the system, can not drop privileges" -msgstr "" +msgstr "Ingen sandkassebruger »%s« pĂ¥ systemet; kan ikke droppe privilegier" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" +"Overførsel udføres uden for sandkassen som root, da filen »%s« ikke kunne " +"tilgĂ¥s af brugeren »%s«." #: apt-pkg/acquire.cc apt-pkg/clean.cc -#, fuzzy, c-format +#, c-format msgid "Clean of %s is not supported" -msgstr "Indeksfiler af typen »%s« understøttes ikke" +msgstr "Rensning af %s er ikke understøttet" #: apt-pkg/acquire.cc apt-pkg/clean.cc apt-pkg/contrib/cdromutl.cc #: methods/mirror.cc @@ -637,18 +654,21 @@ msgid "Failed to stat the cdrom" msgstr "Kunne ikke finde cdrommen" #: apt-pkg/contrib/cmndline.cc -#, fuzzy, c-format +#, c-format msgid "" "Command line option '%c' [from %s] is not understood in combination with the " "other options." -msgstr "Kommandolinjetilvalget »%c« [fra %s] kendes ikke." +msgstr "" +"Kommandolinjetilvalget »%c« [fra %s] forstĂ¥s ikke i kombination med de andre " +"tilvalg." #: apt-pkg/contrib/cmndline.cc -#, fuzzy, c-format +#, c-format msgid "" "Command line option %s is not understood in combination with the other " "options" -msgstr "Kommandolinjetilvalget %s blev ikke forstĂ¥et" +msgstr "" +"Kommandolinjetilvalget %s forstĂ¥s ikke i kombination med de andre tilvalg" #: apt-pkg/contrib/cmndline.cc #, c-format @@ -828,7 +848,7 @@ msgstr "Problem under lukning af gzip-filen %s" #: apt-pkg/contrib/fileutl.cc msgid "Unexpected end of file" -msgstr "" +msgstr "Uventet filafslutning" #: apt-pkg/contrib/fileutl.cc msgid "Failed to create subprocess IPC" @@ -993,7 +1013,7 @@ msgstr "Det valgte %s blev ikke fundet" #: apt-pkg/deb/debmetaindex.cc #, c-format msgid "Target %s wants to acquire the same file (%s) as %s from source %s" -msgstr "" +msgstr "MĂ¥let %s ønsker at erhverve den samme fil (%s) som %s fra kilden %s" #. TRANSLATOR: an identifier like Packages; Releasefile key indicating #. a file like main/binary-amd64/Packages; filename and linenumber of @@ -1001,7 +1021,7 @@ msgstr "" #: apt-pkg/deb/debmetaindex.cc #, c-format msgid "Target %s (%s) is configured multiple times in %s and %s" -msgstr "" +msgstr "MĂ¥let %s (%s) er konfigureret flere gange i %s og %s" #: apt-pkg/deb/debmetaindex.cc #, c-format @@ -1024,6 +1044,8 @@ msgid "" "No Hash entry in Release file %s which is considered strong enough for " "security purposes" msgstr "" +"Intet hash-punkt i Release-filen %s, som anses for stærk nok til " +"sikkerhedsformĂ¥l." #: apt-pkg/deb/debmetaindex.cc #, c-format @@ -1035,16 +1057,19 @@ msgstr "Ugyldigt punkt »%s« i udgivelsesfil %s" #, c-format msgid "Conflicting values set for option %s regarding source %s %s" msgstr "" +"Værdisæt er ikke i overensstemmelse for tilvalget %s jævnfør kilden %s %s" #: apt-pkg/deb/debmetaindex.cc #, c-format msgid "Invalid value set for option %s regarding source %s %s (%s)" -msgstr "" +msgstr "Ugyldigt værdisæt for tilvalget %s jævnfør kilden %s %s (%s)" #: apt-pkg/deb/debmetaindex.cc #, c-format msgid "Conflicting values set for option %s regarding source %s %s: %s != %s" msgstr "" +"Værdisæt er ikke i overenstemmelse for tilvalget %s jævnfør kilden %s %s: " +"%s != %s" #: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc #, c-format @@ -1070,7 +1095,7 @@ msgstr "Kunne ikke lĂ¥se administrationsmappen (%s), er du rod (root)?" #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "dpkg blev afbrudt, du skal manuelt køre »%s« for at rette problemet." +msgstr "dpkg blev afbrudt, du skal manuelt køre »%s« for at rette problemet. " #: apt-pkg/deb/debsystem.cc msgid "Not locked" @@ -1264,24 +1289,20 @@ msgid "Execute external solver" msgstr "Kør ekstern problemløser" #: apt-pkg/edsp.cc -#, fuzzy msgid "Execute external planner" -msgstr "Kør ekstern problemløser" +msgstr "Kør ekstern planlægger" #: apt-pkg/edsp.cc -#, fuzzy msgid "Send request to planner" -msgstr "Send forespørgsel til problemløser" +msgstr "Send forespørgsel til planlægger" #: apt-pkg/edsp.cc -#, fuzzy msgid "Send scenario to planner" -msgstr "Send scenarie til problemløser" +msgstr "Send scenarie til planlægger" #: apt-pkg/edsp.cc -#, fuzzy msgid "External planner failed without a proper error message" -msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked" +msgstr "Ekstern planlægger mislykkedes uden en korrekt fejlbesked" #: apt-pkg/indexcopy.cc #, c-format @@ -1376,14 +1397,13 @@ msgid "This APT does not support the versioning system '%s'" msgstr "Denne APT understøtter ikke versionssystemet »%s«" #: apt-pkg/pkgcache.cc -#, fuzzy, c-format +#, c-format msgid "The package cache was built for different architectures: %s vs %s" -msgstr "Pakke-mellemlageret er lavet til en anden arkitektur" +msgstr "Pakke-mellemlageret blev kompileret for andre arkitekturer: %s vs %s" #: apt-pkg/pkgcache.cc -#, fuzzy msgid "The package cache file is corrupted, it has the wrong hash" -msgstr "Pakke-mellemlagerets fil er ødelagt, den er for lille" +msgstr "Pakke-mellemlagerets fil er ødelagt, den har forkert hash" #: apt-pkg/pkgcache.cc msgid "Depends" @@ -1506,6 +1526,8 @@ msgstr "Kunne ikke forstĂ¥ pin-type %s" #, c-format msgid "%s: Value %s is outside the range of valid pin priorities (%d to %d)" msgstr "" +"%s: Værdien %s er uden for intervallet med gyldige pin-prioriteringer (%d " +"til %d)" #: apt-pkg/policy.cc msgid "No priority (or zero) specified for pin" @@ -1513,9 +1535,9 @@ msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin" #. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports #: apt-pkg/sourcelist.cc -#, fuzzy, c-format +#, c-format msgid "Malformed entry %u in %s file %s (%s)" -msgstr "Ugyldig overskrivning af %s-linjen %llu (%s)" +msgstr "Forkert udformet punkt %u i %s-linjen %s (%s)" #: apt-pkg/sourcelist.cc #, c-format @@ -1533,9 +1555,9 @@ msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen »%s« er ukendt pĂ¥ linje %u i kildelisten %s" #: apt-pkg/sourcelist.cc -#, fuzzy, c-format +#, c-format msgid "Malformed stanza %u in source list %s (type)" -msgstr "Ugyldig linje %u i kildelisten %s (type)" +msgstr "Forkert udformet stanza %u i kildelisten %s (type)" #: apt-pkg/sourcelist.cc #, c-format @@ -1545,7 +1567,7 @@ msgstr "Typen »%s« er ukendt pĂ¥ stanza %u i kildelisten %s" #: apt-pkg/sourcelist.cc #, c-format msgid "Unsupported file %s given on commandline" -msgstr "" +msgstr "Filen %s er ikke understøttet nĂ¥r angivet pĂ¥ kommandolinjen" #: apt-pkg/srcrecords.cc msgid "You must put some 'source' URIs in your sources.list" @@ -1554,7 +1576,7 @@ msgstr "Du skal have nogle »source«-URI'er i din sources.list" #: apt-pkg/tagfile.cc #, c-format msgid "Cannot convert %s to integer: out of range" -msgstr "" +msgstr "Kan ikke konvertere %s til heltal: uden for interval" #: apt-pkg/update.cc apt-private/private-download.cc #, c-format @@ -1610,15 +1632,15 @@ msgid " [Working]" msgstr " [Arbejder]" #: apt-private/acqprogress.cc -#, fuzzy, c-format +#, c-format msgid "" "Media change: please insert the disc labeled\n" " '%s'\n" "in the drive '%s' and press [Enter]\n" msgstr "" -"Medieskift: Indsæt disken med navnet\n" +"Medieskift: Indsæt venligst disken med navnet\n" " »%s«\n" -"i drevet »%s« og tryk retur\n" +"i drevet »%s« og tryk [Retur]\n" #: apt-private/private-cachefile.cc msgid "Correcting dependencies..." @@ -1640,51 +1662,53 @@ msgstr "Kunne ikke minimere opgraderingssættet" msgid " Done" msgstr " Færdig" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Du kan muligvis rette dette ved at køre »apt-get -f install«." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "Du kan muligvis rette dette ved at køre »apt --fix-broken install«." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Uopfyldte afhængigheder. Prøv med -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Uopfyldte afhængigheder. Prøv »apt --fix-broken install« uden pakker (eller " +"angiv en løsning)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" msgstr "Sortering" #: apt-private/private-cacheset.cc -#, fuzzy, c-format +#, c-format msgid "Note, selecting '%s' for task '%s'\n" -msgstr "Valgt version »%s« (%s) for »%s«\n" +msgstr "Bemærk, vælger »%s« for opgaven »%s«\n" #: apt-private/private-cacheset.cc -#, fuzzy, c-format +#, c-format msgid "Note, selecting '%s' for glob '%s'\n" -msgstr "Valgt version »%s« (%s) for »%s«\n" +msgstr "Bemærk, vælger »%s« for glob'en »%s«\n" #: apt-private/private-cacheset.cc -#, fuzzy, c-format +#, c-format msgid "Note, selecting '%s' for regex '%s'\n" -msgstr "Valgt version »%s« (%s) for »%s«\n" +msgstr "Bemærk, vælger »%s« for glob'en »%s«\n" #: apt-private/private-cacheset.cc -#, fuzzy, c-format +#, c-format msgid "Package %s is a virtual package provided by:\n" -msgstr "men det er en virtuel pakke" +msgstr "Pakken %s er en virtuel pakke tilbudt af:\n" #: apt-private/private-cacheset.cc -#, fuzzy msgid " [Installed]" -msgstr "[Installeret]" +msgstr " [Installeret]" #: apt-private/private-cacheset.cc -#, fuzzy msgid " [Not candidate version]" -msgstr "Kandidatversioner" +msgstr " [Ingen kandidatversion]" #: apt-private/private-cacheset.cc msgid "You should explicitly select one to install." -msgstr "" +msgstr "Du skal eksplicit vælge en at installere." #: apt-private/private-cacheset.cc #, c-format @@ -1693,46 +1717,49 @@ msgid "" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" msgstr "" +"Pakken %s er ikke tilgængelig, men der refereres til den af en\n" +"anden pakke. Det kan betyde at pakken mangler, er blevet forældet\n" +"eller kun er tilgængelig fra en anden kilde\n" #: apt-private/private-cacheset.cc -#, fuzzy msgid "However the following packages replace it:" -msgstr "Følgende pakker vil blive opgraderet:" +msgstr "De følgende pakker vil dog erstatte den:" #: apt-private/private-cacheset.cc -#, fuzzy, c-format +#, c-format msgid "Package '%s' has no installation candidate" -msgstr "Pakke »%s« er ikke installeret, sĂ¥ blev ikke fjernet\n" +msgstr "Pakken »%s« har ingen installationskandidat" #: apt-private/private-cacheset.cc #, c-format msgid "Virtual packages like '%s' can't be removed\n" -msgstr "" +msgstr "Virtuelle pakker som »%s« kan ikke fjernes\n" #. TRANSLATORS: Note, this is not an interactive question #: apt-private/private-cacheset.cc apt-private/private-install.cc #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -msgstr "Pakke »%s« er ikke installeret, sĂ¥ blev ikke fjernet. Mente du »%s«?\n" +msgstr "" +"Pakken »%s« er ikke installeret, sĂ¥ blev ikke fjernet. Mente du »%s«?\n" #: apt-private/private-cacheset.cc apt-private/private-install.cc #, c-format msgid "Package '%s' is not installed, so not removed\n" -msgstr "Pakke »%s« er ikke installeret, sĂ¥ blev ikke fjernet\n" +msgstr "Pakken »%s« er ikke installeret, sĂ¥ blev ikke fjernet\n" #: apt-private/private-cacheset.cc -#, fuzzy, c-format +#, c-format msgid "Note, selecting '%s' instead of '%s'\n" -msgstr "Vælger »%s« som kildepakke fremfor »%s«\n" +msgstr "Bemærk, vælger »%s« i stedet for »%s«\n" #: apt-private/private-cmndline.cc msgid "Most used commands:" -msgstr "" +msgstr "De mest anvendte kommandoer:" #: apt-private/private-cmndline.cc #, c-format msgid "See %s for more information about the available commands." -msgstr "" +msgstr "Se %s for yderligere information om de tilgængelige kommandoer." #: apt-private/private-cmndline.cc msgid "" @@ -1741,6 +1768,10 @@ msgid "" "Package and version choices can be expressed via apt_preferences(5).\n" "Security details are available in apt-secure(8).\n" msgstr "" +"Konfigurationstilvalg og -syntaks er omtalt detaljeret i apt.conf(5).\n" +"Information om hvordan kilder konfigureres kan findes i sources.list(5).\n" +"Pakke- og versionsvalg kan udtrykkes via apt_preferences(5).\n" +"Sikkerhedsdetaljer er tilgængelige i apt-secure(8).\n" #: apt-private/private-cmndline.cc msgid "This APT has Super Cow Powers." @@ -1776,13 +1807,16 @@ msgid "" "--force-yes is deprecated, use one of the options starting with --allow " "instead." msgstr "" +"--force-yes er forældet, brug i stedet for et af tilvalgene startende med --" +"allow" #: apt-private/private-download.cc -#, fuzzy msgid "" "There were unauthenticated packages and -y was used without --allow-" "unauthenticated" -msgstr "Der er problemer og -y blev brugt uden --force-yes" +msgstr "" +"Der var pakker uden godkendelser og -y blev brugt uden --allow-" +"unauthenticated" #: apt-private/private-download.cc #, c-format @@ -1828,6 +1862,14 @@ msgid "Broken packages" msgstr "Ă˜delagte pakker" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Kunne ikke hente nogle af arkiverne. Prøv evt. at køre »apt-get update« " +"eller prøv med --fix-missing." + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!" @@ -1836,22 +1878,24 @@ msgid "Packages need to be removed but remove is disabled." msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." #: apt-private/private-install.cc -#, fuzzy msgid "" "Essential packages were removed and -y was used without --allow-remove-" "essential." -msgstr "Der er problemer og -y blev brugt uden --force-yes" +msgstr "" +"Essentielle pakker blev fjernet og -y blev brugt uden --allow-remove-" +"essential." #: apt-private/private-install.cc -#, fuzzy msgid "Packages were downgraded and -y was used without --allow-downgrades." -msgstr "Der er problemer og -y blev brugt uden --force-yes" +msgstr "Pakker blev nedgraderet og -y blev brugt uden --allow-downgrades." #: apt-private/private-install.cc msgid "" "Held packages were changed and -y was used without --allow-change-held-" "packages." msgstr "" +"Tilbageholdte pakker blev ændret og -y blev brugt uden --allow-change-held-" +"packages." #: apt-private/private-install.cc msgid "Internal error, Ordering didn't finish" @@ -1928,14 +1972,6 @@ msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i »hent-kun«-tilstand" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Kunne ikke hente nogle af arkiverne. Prøv evt. at køre »apt-get update« " -"eller prøv med --fix-missing." - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og medieskift understøttes endnu ikke" @@ -2011,21 +2047,8 @@ msgstr[0] "Brug »%s« til at fjerne den." msgstr[1] "Brug »%s« til at fjerne dem." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Du kan muligvis rette det ved at køre »apt-get -f install«:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Uopfyldte afhængigheder. Prøv »apt-get -f install« uden pakker (eller angiv " -"en løsning)." - -#: apt-private/private-install.cc -#, fuzzy msgid "The following additional packages will be installed:" -msgstr "Følgende yderligere pakker vil blive installeret:" +msgstr "De følgende yderligere pakker vil blive installeret:" #: apt-private/private-install.cc msgid "Suggested packages:" @@ -2056,9 +2079,9 @@ msgstr "Geninstallation af %s er ikke muligt, pakken kan ikke hentes.\n" #. TRANSLATORS: First string is package name, second is version #: apt-private/private-install.cc -#, fuzzy, c-format +#, c-format msgid "%s is already the newest version (%s).\n" -msgstr "%s er allerede den nyeste version.\n" +msgstr "%s er allerede den nyeste version (%s).\n" #: apt-private/private-install.cc cmdline/apt-get.cc cmdline/apt-mark.cc #, c-format @@ -2306,7 +2329,7 @@ msgstr "»Pinned« pakker:" #: apt-private/private-show.cc #, c-format msgid "%s -> %s with priority %d\n" -msgstr "" +msgstr "%s -> %s med prioritet %d\n" #: apt-private/private-show.cc msgid " Installed: " @@ -2418,7 +2441,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen »%s« fejlede.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tjek om pakken »dpkg-dev« er installeret.\n" @@ -2453,12 +2475,12 @@ msgstr "" #: apt-private/private-source.cc #, c-format msgid "Note, using directory '%s' to get the build dependencies\n" -msgstr "" +msgstr "Bemærk, bruger mappen »%s« til at hente kompileringsafhængighederne\n" #: apt-private/private-source.cc -#, fuzzy, c-format +#, c-format msgid "Note, using file '%s' to get the build dependencies\n" -msgstr "Kunne ikke behandler opbygningsafhængighederne" +msgstr "Bemærk, bruger filen »%s« til at hente kompileringsafhængighederne\n" #: apt-private/private-source.cc msgid "Failed to process build dependencies" @@ -2498,9 +2520,8 @@ msgid "All packages are up to date." msgstr "Alle pakker er opdateret." #: cmdline/apt-cache.cc -#, fuzzy msgid "apt-cache stats does not take any arguments" -msgstr "»update«-kommandoen benytter ingen parametre" +msgstr "»apt-cache stats« benytter ingen parametre" #: cmdline/apt-cache.cc msgid "Total package names: " @@ -2583,6 +2604,16 @@ msgid "" "too long ago, but in exchange apt-cache works independently of the\n" "availability of the configured sources (e.g. offline).\n" msgstr "" +"Brug: apt-cache [tilvalg] kommando\n" +" apt-cache [tilvalg] show pakke1 [pakke2 ...]\n" +"\n" +"apt-cache forespørger og viser tilgængelig information om installerede\n" +"pakker og pakker der kan installeres. Programmet fungerer eksklusivt pĂ¥\n" +"data hentet i det lokale mellemlager via kommandoen »update« for f.eks.\n" +"apt-get. Den viste information kan derfor være forældet, hvis den sidste\n" +"opdatering ikke var sĂ¥ lang tid siden, men til gengæld fungerer apt-cache\n" +"uafhængig af tilgængeligheden for de konfigurerede kilder (f.eks.\n" +"frakoblet).\n" #: cmdline/apt-cache.cc msgid "Show source records" @@ -2618,14 +2649,13 @@ msgstr "" "Angiv venligst et navn for denne disk, som f.eks. »Debian 5.0.3 Disk 1«" #: cmdline/apt-cdrom.cc -#, fuzzy msgid "Please insert a Disc in the drive and press [Enter]" -msgstr "Indsæt en disk i drevet og tryk retur" +msgstr "Indsæt venligst en disk i drevet og tryk [Retur]" #: cmdline/apt-cdrom.cc #, c-format msgid "Failed to mount '%s' to '%s'" -msgstr "Kunne ikke montere %s til %s" +msgstr "Kunne ikke montere »%s« til »%s«" #: cmdline/apt-cdrom.cc msgid "" @@ -2651,13 +2681,17 @@ msgid "" "media types as package sources to APT. The mount point and device\n" "information is taken from apt.conf(5), udev(7) and fstab(5).\n" msgstr "" +"Brug: apt-cdrom [tilvalg] kommando\n" +"\n" +"apt-cdrom bruges til at tilføje cd-rom'er, USB-flashdrev og andre\n" +"eksterne medietyper som pakkekilder til APT. Monteringspunktet og\n" +"enhedsinformationen tages fra apt.conf(5), udev(7) og fstab(5).\n" #: cmdline/apt-config.cc msgid "Arguments not in pairs" msgstr "Parametre ikke angivet i par" #: cmdline/apt-config.cc -#, fuzzy msgid "" "Usage: apt-config [options] command\n" "\n" @@ -2666,15 +2700,17 @@ msgid "" msgstr "" "Brug: apt-config [tilvalg] kommando\n" "\n" -"apt-config er et simpelt værktøj til at læse APTs opsætningsfil\n" +"apt-config er en grænseflade til konfigurationsindstillingerne\n" +"brugt af alle APT-værktøjer, hovedsagelig lavet til fejlsøgning\n" +"og skalskriptopbygning.\n" #: cmdline/apt-config.cc msgid "get configuration values via shell evaluation" -msgstr "" +msgstr "hent konfigurationsværdier via skalevaluering" #: cmdline/apt-config.cc msgid "show the active configuration setting" -msgstr "" +msgstr "vis den aktive konfigurationsindstilling" #: cmdline/apt-dump-solver.cc msgid "" @@ -2683,9 +2719,12 @@ msgid "" "apt-dump-solver is an interface to store an EDSP scenario in\n" "a file and optionally forwards it to another solver.\n" msgstr "" +"Brug: apt-dump-solver\n" +"\n" +"apt-dump-solver er en grænseflade til at lagre et EDSP-scenarie i\n" +"en fil og valgfrit videresende den til en anden problemløser.\n" #: cmdline/apt-extracttemplates.cc -#, fuzzy msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -2695,14 +2734,10 @@ msgid "" msgstr "" "Brug: apt-extracttemplates fil1 [fil2 ...]\n" "\n" -"apt-extracttemplates er et værktøj til at uddrage opsætnings- og skabelon-" -"oplysninger fra Debianpakker\n" -"\n" -"Tilvalg:\n" -" -h Denne hjælpetekst\n" -" -t Angiv temp-mappe\n" -" -c=? Læs denne opsætningsfil\n" -" -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" +"apt-extracttemplates bruges til at udtrække konfigurations- og\n" +"skabelonfiler fra Debianpakker. Programmet bruges derfor hovedsagelig\n" +"af debconf(1) til at stille konfigurationsspørgsmĂ¥l før installationen\n" +"af pakker.\n" #: cmdline/apt-extracttemplates.cc msgid "Cannot get debconf version. Is debconf installed?" @@ -2735,7 +2770,6 @@ msgid "Supported modules:" msgstr "Understøttede moduler:" #: cmdline/apt-get.cc -#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -2750,9 +2784,9 @@ msgstr "" " apt-get [tilvalg] install|remove pakke1 [pakke2 ...]\n" " apt-get [tilvalg] source pakke1 [pakke2 ...]\n" "\n" -"apt-get er en simpel kommandolinjegrænseflade til at hente og\n" -"installere pakker. De hyppigst brugte kommandoer er update og\n" -"install.\n" +"apt-get er en kommandolinjegrænseflade til at hente pakker og\n" +"information om dem fra godkendte kilder og for installation,\n" +"opgradering og fjernelse af pakker sammen med deres afhængigheder.\n" #: cmdline/apt-get.cc msgid "Retrieve new lists of packages" @@ -2816,7 +2850,7 @@ msgstr "Hent og vis ændringsloggen for den angivne pakke" #: cmdline/apt-helper.cc msgid "Need one URL as argument" -msgstr "" +msgstr "Skal bruge en adresse som argument" #: cmdline/apt-helper.cc msgid "Must specify at least one pair url/filename" @@ -2829,10 +2863,9 @@ msgstr "Kunne ikke hente pakkerne" #: cmdline/apt-helper.cc #, c-format msgid "GetSrvRec failed for %s" -msgstr "" +msgstr "GetSrvRec mislykkedes for %s" #: cmdline/apt-helper.cc -#, fuzzy msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] cat-file file ...\n" @@ -2842,9 +2875,12 @@ msgid "" "e.g. the same proxy configuration or acquire system as APT would.\n" msgstr "" "Brug: apt-helper [tilvalg] kommando\n" -" apt-helper [tilvalg] download-file uri target-path\n" +" apt-helper [tilvalg] cat-file-fil ...\n" +" apt-helper [tilvalg] download-file uri mĂ¥l-sti\n" "\n" -"apt-helper er et internt hjælpeprogram for apt\n" +"apt-helper samler en række kommandoer som skalskripter kan bruge\n" +"f.eks. den samme proxykonfiguration eller indhentelsessystem som\n" +"APT ville anvende.\n" #: cmdline/apt-helper.cc msgid "download the given uri to the target-path" @@ -2852,18 +2888,17 @@ msgstr "hent den angivne uri til mĂ¥l-sti" #: cmdline/apt-helper.cc msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)" -msgstr "" +msgstr "slĂ¥ en SRV-post op (f.eks. _http._tcp.ftp.debian.org)" #: cmdline/apt-helper.cc msgid "concatenate files, with automatic decompression" -msgstr "" +msgstr "sammenkæd filer, med automatisk dekomprimering" #: cmdline/apt-helper.cc msgid "detect proxy using apt.conf" -msgstr "" +msgstr "detekter proxy via apt.conf" #: cmdline/apt-internal-planner.cc -#, fuzzy msgid "" "Usage: apt-internal-planner\n" "\n" @@ -2871,20 +2906,13 @@ msgid "" "installation planner for the APT family like an external one,\n" "for debugging or the like.\n" msgstr "" -"Brug: apt-internal-solver\n" -"\n" -"apt-internal-solver er en grænseflade, der skal bruge den aktuelle\n" -"interne som en ekstern problemløser for APT-familien for fejlsøgning\n" -"eller lignende\n" +"Brug: apt-internal-planner\n" "\n" -"Tilvalg:\n" -" -h Denne hjælpetekst.\n" -" -q Logbare uddata - ingen statusindikator\n" -" -c=? Læs denne konfigurationsfil\n" -" -o=? Angiv et arbitrærtkonfigurationstilvalg, f.eks. -o dir::cache=/tmp\n" +"apt-internal-planner er en grænseflade, til at bruge den nuværende\n" +"interne installationsplanlægger for APT-familien sĂ¥som en ekstern,\n" +"til fejlsøgning eller lignende.\n" #: cmdline/apt-internal-solver.cc -#, fuzzy msgid "" "Usage: apt-internal-solver\n" "\n" @@ -2894,15 +2922,9 @@ msgid "" msgstr "" "Brug: apt-internal-solver\n" "\n" -"apt-internal-solver er en grænseflade, der skal bruge den aktuelle\n" -"interne som en ekstern problemløser for APT-familien for fejlsøgning\n" -"eller lignende\n" -"\n" -"Tilvalg:\n" -" -h Denne hjælpetekst.\n" -" -q Logbare uddata - ingen statusindikator\n" -" -c=? Læs denne konfigurationsfil\n" -" -o=? Angiv et arbitrærtkonfigurationstilvalg, f.eks. -o dir::cache=/tmp\n" +"apt-internal-solver er en grænseflade, der skal bruge den nuværende\n" +"problemløser for APT-familien som en ekstern, til fejlsøgning eller\n" +"lignende\n" #: cmdline/apt-mark.cc #, c-format @@ -2946,20 +2968,19 @@ msgstr "Afbrød i bero for %s.\n" #: cmdline/apt-mark.cc #, c-format msgid "Selected %s for purge.\n" -msgstr "" +msgstr "Valgte %s for fuldstænding fjernelse.\n" #: cmdline/apt-mark.cc #, c-format msgid "Selected %s for removal.\n" -msgstr "" +msgstr "Valgte %s for fjernelse.\n" #: cmdline/apt-mark.cc #, c-format msgid "Selected %s for installation.\n" -msgstr "" +msgstr "Valgte %s for installation.\n" #: cmdline/apt-mark.cc -#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -2971,8 +2992,9 @@ msgstr "" "Brug: apt-mark [tilvalg] {auto|manual} pakke1 [pakke2 ...]\n" "\n" "apt-mark er en simpel kommandolinjegrænseflade for markering af pakker\n" -"som manuelt eller automatisk installeret. Programmet kan ogsĂ¥ vise\n" -"markeringerne.\n" +"som manuelt eller automatisk installeret. Programmet kan ogsĂ¥ bruges\n" +"til at manipulere dpkg(1)-markeringstilstande for pakker, og til at\n" +"vise alle pakker med eller uden en bestemt markering.\n" #: cmdline/apt-mark.cc msgid "Mark the given packages as automatically installed" @@ -3014,6 +3036,12 @@ msgid "" "By default it sorts by binary package information, but the -s option\n" "can be used to switch to source package ordering instead.\n" msgstr "" +"Brug: apt-sortpkgs [tilvalg] fil1 [fil2 ...]\n" +"\n" +"apt-sortpkgs er et simpelt værktøj til at sortere informationsfiler for\n" +"pakker. Som standard sorteres efter den binære pakkeinformation, men\n" +"tilvalget -s kan bruges til at skifte til kildepakkerækkefølge i stedet\n" +"for.\n" #: cmdline/apt.cc msgid "" @@ -3025,6 +3053,13 @@ msgid "" "like apt-get and apt-cache, but enables options more suitable for\n" "interactive use by default.\n" msgstr "" +"Brug: apt [tilvalg] kommando\n" +"\n" +"apt er en pakkehĂ¥ndtering for kommandolinjen og den tilbyder kommandoer\n" +"for søgning og hĂ¥ndtering samt forespørgsel af information om pakker.\n" +"Den tilbyder den samme funktionalitet som de specialiserede APT-værktøjer,\n" +"sĂ¥som apt-get og apt-cache, men aktiverer tilvalg mere egnet for\n" +"interaktiv brug som standard.\n" #. query #: cmdline/apt.cc @@ -3072,9 +3107,8 @@ msgid "Bad default setting!" msgstr "Ugyldig standardindstilling!" #: dselect/install dselect/update -#, fuzzy msgid "Press [Enter] to continue." -msgstr "Tryk retur for at fortsætte." +msgstr "Tryk [Retur] for at fortsætte." #: dselect/install msgid "Do you want to erase any previously downloaded .deb files?" @@ -3399,6 +3433,56 @@ msgid " %s has no binary override entry either\n" msgstr "" " %s har ingen linje med tilsidesættelse af standard for binøre filer\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Afventer hoveder" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "Http-serveren sendte et ugyldigt svarhovede" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Ugyldig linje i hovedet" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "Http-serveren sendte et ugyldigt Content-Length-hovede" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "Http-serveren sendte et ugyldigt Content-Range-hovede" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "" +"Denne http-servere har fejlagtig understøttelse af intervaller (»ranges«)" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Ukendt datoformat" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Ugyldige hoved-data" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Forbindelsen mislykkedes" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" +"Deaktiverede automatisk %s pĂ¥ grund af ukorrekt svar fra server/proxy. (man " +"5 apt.conf)" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Intern fejl" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3433,7 +3517,7 @@ msgstr "Fil blev ikke fundet" #: methods/connect.cc #, c-format msgid "Direct connection to %s domains is blocked by default." -msgstr "" +msgstr "Direkte forbindelse til %s-domæner er som standard blokeret." #: methods/connect.cc methods/http.cc #, c-format @@ -3650,12 +3734,11 @@ msgstr "Kunne ikke udføre " #. TRANSLATORS: %s is a single techy word like 'NODATA' #: methods/gpgv.cc -#, fuzzy, c-format +#, c-format msgid "" "Signed file isn't valid, got '%s' (does the network require authentication?)" msgstr "" -"Clearsigned-fil er ikke gyldig, fik »%s« (kræver netværket ikke " -"autentificering?)" +"Underskrevet fil er ikke gyldig, fik »%s« (kræver netværket godkendelse?)" #: methods/gpgv.cc msgid "At least one invalid signature was encountered." @@ -3681,7 +3764,7 @@ msgstr "Ukendt fejl ved kørsel af apt-key" #: methods/gpgv.cc #, c-format msgid "Signature by key %s uses weak digest algorithm (%s)" -msgstr "" +msgstr "Signaturen med nøglen %s bruger en svag sammendragsalgoritme (%s)" #: methods/gpgv.cc msgid "The following signatures were invalid:\n" @@ -3755,355 +3838,6 @@ msgstr "Kunne ikke angive ændringstidspunkt" msgid "Connection closed prematurely" msgstr "Forbindelsen lukkedes for hurtigt" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Afventer hoveder" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "Http-serveren sendte et ugyldigt svarhovede" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Ugyldig linje i hovedet" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Http-serveren sendte et ugyldigt Content-Length-hovede" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Http-serveren sendte et ugyldigt Content-Range-hovede" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "" -"Denne http-servere har fejlagtig understøttelse af intervaller (»ranges«)" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Ukendt datoformat" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Ugyldige hoved-data" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Forbindelsen mislykkedes" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Intern fejl" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "Tomme filer kan ikke være gyldige arkiver" - -#~ msgid "(not found)" -#~ msgstr "(ikke fundet)" - -#~ msgid " Package pin: " -#~ msgstr " Pakke-pin: " - -#~ msgid "There is no public key available for the following key IDs:\n" -#~ msgstr "" -#~ "Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n" - -#, fuzzy -#~ msgid "The repository is insufficiently signed by key %s (%s)" -#~ msgstr "Mappen %s er omrokeret" - -#~ msgid "" -#~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " -#~ "packages" -#~ msgstr "" -#~ "Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt pĂ¥ »%s«" - -#~ msgid "" -#~ "%s dependency for %s cannot be satisfied because the package %s cannot be " -#~ "found" -#~ msgstr "" -#~ "Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet" - -#~ msgid "" -#~ "Failed to satisfy %s dependency for %s: Installed package %s is too new" -#~ msgstr "" -#~ "Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er " -#~ "for ny" - -#~ msgid "" -#~ "%s dependency for %s cannot be satisfied because candidate version of " -#~ "package %s can't satisfy version requirements" -#~ msgstr "" -#~ "Afhængigheden %s for %s kan ikke opfyldes, da ingen af de tilgængelige " -#~ "kandidater for pakken %s kan tilfredsstille versionskravene" - -#~ msgid "" -#~ "%s dependency for %s cannot be satisfied because package %s has no " -#~ "candidate version" -#~ msgstr "" -#~ "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en " -#~ "kandidatversion" - -#~ msgid "Failed to satisfy %s dependency for %s: %s" -#~ msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s" - -#~ msgid "Build-dependencies for %s could not be satisfied." -#~ msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes." - -#~ msgid "Problem unlinking %s" -#~ msgstr "Problem under aflænkning af %s" - -#~ msgid "Failed to unlink %s" -#~ msgstr "Kunne ikke frigøre %s" - -#~ msgid "" -#~ "Usage: apt-cache [options] command\n" -#~ " apt-cache [options] show pkg1 [pkg2 ...]\n" -#~ "\n" -#~ "apt-cache is a low-level tool used to query information\n" -#~ "from APT's binary cache files\n" -#~ msgstr "" -#~ "Brug: apt-cache [tilvalg] kommando\n" -#~ " apt-cache [tilvalg] show pakke1 [pakke2 ...]\n" -#~ "\n" -#~ "apt-cache er et lavniveauværktøj, brugt til at manipulere APTs\n" -#~ "binære mellemlagerfiler og hente oplysninger fra dem.\n" - -#~ msgid "Commands:" -#~ msgstr "Kommandoer:" - -#~ msgid "" -#~ "Options:\n" -#~ " -h This help text.\n" -#~ " -p=? The package cache.\n" -#~ " -s=? The source cache.\n" -#~ " -q Disable progress indicator.\n" -#~ " -i Show only important deps for the unmet command.\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" -#~ msgstr "" -#~ "Tilvalg:\n" -#~ " -h Denne hjælpetekst.\n" -#~ " -p=? Pakkemellemlageret.\n" -#~ " -s=? Kildemellemlageret.\n" -#~ " -q Deaktiver fremgangsindikatoren.\n" -#~ " -i Vis kun vigtige afhængigheder for kommandoen »unmet«.\n" -#~ " -c=? Læs denne opsætningsfil\n" -#~ " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" -#~ "Se manualsiderne for apt-cache(8) og apt.conf(5) for flere oplysninger.\n" - -#, fuzzy -#~ msgid "" -#~ "Usage: apt [options] command\n" -#~ "\n" -#~ "CLI for apt.\n" -#~ msgstr "" -#~ "Brug: apt [tilvalg] kommando\n" -#~ "\n" -#~ "CLI for apt.\n" - -#, fuzzy -#~ msgid "" -#~ "Options:\n" -#~ " -h This help text\n" -#~ " -d CD-ROM mount point\n" -#~ " -r Rename a recognized CD-ROM\n" -#~ " -m No mounting\n" -#~ " -f Fast mode, don't check package files\n" -#~ " -a Thorough scan mode\n" -#~ " --no-auto-detect Do not try to auto detect drive and mount point\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ "See fstab(5)\n" -#~ msgstr "" -#~ "Tilvalg:\n" -#~ " -h Denne hjælpetekst.\n" -#~ " -q Logbar uddata - ingen statusindikator\n" -#~ " -qq Ingen uddata undtagen for fejl\n" -#~ " -s Ingen handling. Viser kun hvad der ville blive udført.\n" -#~ " -f læs/skriv auto/manuel markering i den givne fil\n" -#~ " -c=? Læs denne konfigurationsfil\n" -#~ " -o=? Angiv en arbitrær konfigurationsindstilling, f.eks. -o dir::cache=/" -#~ "tmp\n" -#~ "Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information." - -#~ msgid "" -#~ "Options:\n" -#~ " -h This help text.\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ msgstr "" -#~ "Tilvalg:\n" -#~ " -h Denne hjælpetekst.\n" -#~ " -c=? Læs denne opsætningsfil\n" -#~ " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" - -#~ msgid "" -#~ "Options:\n" -#~ " -h This help text.\n" -#~ " -q Loggable output - no progress indicator\n" -#~ " -qq No output except for errors\n" -#~ " -s No-act. Just prints what would be done.\n" -#~ " -f read/write auto/manual marking in the given file\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." -#~ msgstr "" -#~ "Tilvalg:\n" -#~ " -h Denne hjælpetekst.\n" -#~ " -q Logbar uddata - ingen statusindikator\n" -#~ " -qq Ingen uddata undtagen for fejl\n" -#~ " -s Ingen handling. Viser kun hvad der ville blive udført.\n" -#~ " -f læs/skriv auto/manuel markering i den givne fil\n" -#~ " -c=? Læs denne konfigurationsfil\n" -#~ " -o=? Angiv en arbitrær konfigurationsindstilling, f.eks. -o dir::cache=/" -#~ "tmp\n" -#~ "Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information." - -#~ msgid "" -#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -#~ "\n" -#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is " -#~ "used\n" -#~ "to indicate what kind of file it is.\n" -#~ "\n" -#~ "Options:\n" -#~ " -h This help text\n" -#~ " -s Use source file sorting\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ msgstr "" -#~ "Brug: apt-sortpkgs [tilvalg] fil1 [fil2 ...]\n" -#~ "\n" -#~ "apt-sortpkgs er et simpelt værktøj til at sortere pakkefiler. Tilvalget -" -#~ "s\n" -#~ "bruges til at angive filens type.\n" -#~ "\n" -#~ "Tilvalg:\n" -#~ " -h Denne hjælpetekst\n" -#~ " -s Benyt kildefils-sortering\n" -#~ " -c=? Læs denne opsætningsfil\n" -#~ " -o=? Angiv en opsætningsindstilling. F.eks. -o dir::cache=/tmp\n" - -#~ msgid "Child process failed" -#~ msgstr "Barneprocessen fejlede" - -#, fuzzy -#~ msgid "Must specifc at least one srv record" -#~ msgstr "Du skal angive mindst et par i form af adresse/filnavn" - -#~ msgid "Failed to create pipes" -#~ msgstr "Kunne ikke oprette videreførsler" - -#~ msgid "Failed to exec gzip " -#~ msgstr "Kunne ikke udføre gzip " - -#~ msgid "%s %s for %s compiled on %s %s\n" -#~ msgstr "%s %s for %s kompileret pĂ¥ %s %s\n" - -#~ msgid "Failed to create FILE*" -#~ msgstr "Kunne ikke oprette FILE*" - -#~ msgid "Malformed stanza %u in source list %s (URI parse)" -#~ msgstr "Ugyldig stanza %u i kildelisten %s (tolkning af URI)" - -#~ msgid "Malformed line %lu in source list %s ([option] unparseable)" -#~ msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)" - -#~ msgid "Malformed line %lu in source list %s ([option] too short)" -#~ msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)" - -#~ msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -#~ msgstr "Ugyldig linje %lu i kildelisten %s ([%s] er ikke en opgave)" - -#~ msgid "Malformed line %lu in source list %s ([%s] has no key)" -#~ msgstr "Ugyldig linje %lu i kildelisten %s ([%s] har ingen nøgle)" - -#~ msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" -#~ msgstr "Ugyldig linje %lu i kildelisten %s ([%s] nøgle %s har ingen værdi)" - -#~ msgid "Malformed line %lu in source list %s (URI)" -#~ msgstr "Ugyldig linje %lu i kildelisten %s (URI)" - -#~ msgid "Malformed line %lu in source list %s (dist)" -#~ msgstr "Ugyldig linje %lu i kildelisten %s (dist)" - -#~ msgid "Malformed line %lu in source list %s (URI parse)" -#~ msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" - -#~ msgid "Malformed line %lu in source list %s (absolute dist)" -#~ msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" - -#~ msgid "Malformed line %lu in source list %s (dist parse)" -#~ msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" - -#~ msgid "Package %s %s was not found while processing file dependencies" -#~ msgstr "" -#~ "Pakken %s %s blev ikke fundet under behandlingen af filafhængigheder" - -#~ msgid "Couldn't stat source package list %s" -#~ msgstr "Kunne ikke finde kildepakkelisten %s" - -#~ msgid "Collecting File Provides" -#~ msgstr "Samler filudbud" - -#~ msgid "Unable to find hash sum for '%s' in Release file" -#~ msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen" - -#~ msgid "Vendor block %s contains no fingerprint" -#~ msgstr "Leverandørblok %s inderholder intet fingeraftryk" - -#~ msgid "Total dependency version space: " -#~ msgstr "Total afhængighedsversions-plads: " - -#~ msgid "You don't have enough free space in %s" -#~ msgstr "Du har ikke nok ledig plads i %s" - -#~ msgid "Done" -#~ msgstr "Færdig" - -#~ msgid "No keyring installed in %s." -#~ msgstr "Ingen nøglering installeret i %s." - -#~ msgid "Is stdout a terminal?" -#~ msgstr "Er standardud en terminal?" - -#~ msgid "ioctl(TIOCGWINSZ) failed" -#~ msgstr "ioctl(TIOCGWINSZ) mislykkedes" - -#~ msgid "Internal error, Upgrade broke stuff" -#~ msgstr "Intern fejl, opgradering blev afbrudt" - -#~ msgid "%s not a valid DEB package." -#~ msgstr "%s er ikke en gyldig DEB-pakke." - -#~ msgid "" -#~ "Using CD-ROM mount point %s\n" -#~ "Mounting CD-ROM\n" -#~ msgstr "" -#~ "Bruger cdrom-monteringspunktet %s\n" -#~ "Monterer cdrom\n" - -#~ msgid "" -#~ "Could not patch %s with mmap and with file operation usage - the patch " -#~ "seems to be corrupt." -#~ msgstr "" -#~ "Kunne ikke fejlrette (patch) %s med mmap og med filhandlingsbrug - " -#~ "fejlrettelsen ser ud til at være ødelagt." - -#~ msgid "" -#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " -#~ "seems to be corrupt." -#~ msgstr "" -#~ "Kunne ikke fejlrette (patch) %s med mmap (men ingen mmap specifik fejl) - " -#~ "fejlrettelsen ser ud til at være ødelagt." @@ -10,7 +10,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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\n" "PO-Revision-Date: 2014-09-19 13:04+0100\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" @@ -422,8 +422,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1691,13 +1691,17 @@ msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden." msgid " Done" msgstr " Fertig" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "Probieren Sie »apt --fix-broken install«, um dies zu korrigieren." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "UnerfĂ¼llte Abhängigkeiten. Versuchen Sie, -f zu benutzen." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"UnerfĂ¼llte Abhängigkeiten. Versuchen Sie »apt --fix-broken install« ohne " +"Angabe eines Pakets (oder geben Sie eine Lösung an)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1884,6 +1888,14 @@ msgid "Broken packages" msgstr "Beschädigte Pakete" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get " +"update« ausfĂ¼hren oder mit »--fix-missing« probieren?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!" @@ -1985,14 +1997,6 @@ msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get " -"update« ausfĂ¼hren oder mit »--fix-missing« probieren?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstĂ¼tzt." @@ -2071,18 +2075,6 @@ msgstr[0] "Verwenden Sie »%s«, um es zu entfernen." msgstr[1] "Verwenden Sie »%s«, um sie zu entfernen." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"UnerfĂ¼llte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne Angabe " -"eines Pakets (oder geben Sie eine Lösung an)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" @@ -2489,7 +2481,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Entpackbefehl »%s« fehlgeschlagen.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ĂœberprĂ¼fen Sie, ob das Paket »dpkg-dev« installiert ist.\n" @@ -3497,6 +3488,56 @@ msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n" msgid " %s has no binary override entry either\n" msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Warten auf Kopfzeilen" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "Vom HTTP-Server wurde eine ungĂ¼ltige Antwort-Kopfzeile gesandt." + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "UngĂ¼ltige Kopfzeile" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "" +"Vom HTTP-Server wurde eine ungĂ¼ltige »Content-Length«-Kopfzeile gesandt." + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "" +"Vom HTTP-Server wurde eine ungĂ¼ltige »Content-Range«-Kopfzeile gesandt." + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "" +"Teilweise DateiĂ¼bertragung wird vom HTTP-Server nur fehlerhaft unterstĂ¼tzt." + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Unbekanntes Datumsformat" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Fehlerhafte Kopfzeilendaten" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Verbindung fehlgeschlagen" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Interner Fehler" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3864,60 +3905,16 @@ msgstr "Ă„nderungszeitpunkt kann nicht gesetzt werden." msgid "Connection closed prematurely" msgstr "Verbindung vorzeitig beendet" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Warten auf Kopfzeilen" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "Vom HTTP-Server wurde eine ungĂ¼ltige Antwort-Kopfzeile gesandt." - -#: methods/server.cc -msgid "Bad header line" -msgstr "UngĂ¼ltige Kopfzeile" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "" -"Vom HTTP-Server wurde eine ungĂ¼ltige »Content-Length«-Kopfzeile gesandt." - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "" -"Vom HTTP-Server wurde eine ungĂ¼ltige »Content-Range«-Kopfzeile gesandt." - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "" -"Teilweise DateiĂ¼bertragung wird vom HTTP-Server nur fehlerhaft unterstĂ¼tzt." - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Unbekanntes Datumsformat" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Fehlerhafte Kopfzeilendaten" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Verbindung fehlgeschlagen" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Interner Fehler" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "Leere Dateien können kein gĂ¼ltiges Archiv sein." +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "UnerfĂ¼llte Abhängigkeiten. Versuchen Sie, --fix-broken zu benutzen." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "Probieren Sie »apt --fix-broken install«, um dies zu korrigieren:" + #~ msgid "(not found)" #~ msgstr "(nicht gefunden)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -409,8 +409,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1612,13 +1612,18 @@ msgstr "ཡར་བསà¾à¾±à½ºà½‘་འབད་ཡོད་པའི་ཆ་ msgid " Done" msgstr "འབད་à½à½¢à¼‹à½¡à½²à¼" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "འ་ནི་འདི་à½à½´à¼‹à½“ོར་བཅོས་འབད་ནི་ལུ་à½à¾±à½¼à½‘་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་à¼" +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "" +"འ་ནི་འདི་à½à½´à¼‹à½“ོར་བཅོས་འབད་ནི་ལུ་à½à¾±à½¼à½‘་ཀྱི་'apt --fix-broken install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་à¼" -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "མ་à½à½„་པའི་རྟེན་འབྲེལ་à½à½´à¼ -f ལག་ལེན་འà½à½–་སྟེ་འབད་རྩོལ་བསà¾à¾±à½ºà½‘à¼" +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"མ་à½à½„་བའི་རྟེན་འབྲེལ་ à½à½´à½¦à¼‹à½¦à¾’ྲིལ་མེད་མི་à½à½´à¼‹à½‘ང་གཅིག་à½à½¢à¼‹ 'apt --fix-broken install'དེ་འབà½à¼‹à½¢à¾©à½¼à½£à¼‹" +"བསà¾à¾±à½ºà½‘པà¼(ཡང་ན་à½à½–ས་ཤེས་ཅིག་གསལ་བཀོད་འབདà¼)" #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1803,6 +1808,14 @@ msgid "Broken packages" msgstr "ཆད་པ་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་à½à½´à¼" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་à½à½´à½‚ས་པས་ apt-get་དུས་མà½à½´à½“་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-" +"missing་དང་གཅིག་à½à½¢à¼‹à½ བད་རྩོལ་བསà¾à¾±à½ºà½‘་ནི་ཨིན་ན་?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "ནང་འà½à½¼à½‘་ཀྱི་འཛོལ་བ་ གà½à½²à¼‹à½–ཙུགས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་à½à½´à¼‹ ཆད་པ་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་à½à½´à¼‹à½‘ང་གཅིག་à½à½¢à¼‹à½–ོད་བརྡ་འབད་འདི་" @@ -1907,14 +1920,6 @@ msgid "Download complete and in download only mode" msgstr "ཕབ་ལེན་à½à½–ས་ལམ་རà¾à¾±à½„མ་གཅིག་ནང་མཇུག་བསྡུà½à¼‹à½¦à¾¦à½ºà¼‹à½¢à½„་ཕབ་ལེན་འབདà¼" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་à½à½´à½‚ས་པས་ apt-get་དུས་མà½à½´à½“་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-" -"missing་དང་གཅིག་à½à½¢à¼‹à½ བད་རྩོལ་བསà¾à¾±à½ºà½‘་ནི་ཨིན་ན་?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་སà¾à¾±à½¼à½¢à¼‹à½˜à½²à¼‹à½ བད་བསà¼" @@ -1981,18 +1986,6 @@ msgstr[0] "" msgstr[1] "" #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "འདི་à½à½´à¼‹à½“ོར་བཅོས་འབད་ནིའི་དོན་ལུ་à½à¾±à½¼à½‘་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"མ་à½à½„་བའི་རྟེན་འབྲེལ་ à½à½´à½¦à¼‹à½¦à¾’ྲིལ་མེད་མི་à½à½´à¼‹à½‘ང་གཅིག་à½à½¢à¼‹ 'apt-get -f install'དེ་འབà½à¼‹à½¢à¾©à½¼à½£à¼‹à½–སà¾à¾±à½ºà½‘པà¼" -"(ཡང་ན་à½à½–ས་ཤེས་ཅིག་གསལ་བཀོད་འབདà¼)" - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་à½à½ºà½–ས་à½à½´à¼‹à½‚à½à½²à¼‹à½–ཙུགས་འབད་འོང་:" @@ -2377,7 +2370,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "'%s'སྦུང་à½à½“་བཟོ་བཤོལ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev'་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་དེ་གà½à½²à¼‹à½–ཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གà½à½„་འབདà¼\n" @@ -3354,6 +3346,53 @@ msgstr " %s ལུ་འབྱུང་à½à½´à½„ས་མེདཔ་གà½à½„à msgid " %s has no binary override entry either\n" msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གà½à½„་ནིའི་་à½à½¼à¼‹à½–ཀོད་གང་རུང་ཡང་མིན་འདུགà¼\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "མགོ་ཡིག་à½à½´à¼‹à½‚ི་དོན་ལུ་བསྒ྄ག་དོà¼" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "ཨེཆི་à½à½²à¼‹à½à½²à¼‹à½”ི་ སར་བར་འདི་གིས་ནུས་མེད་ལན་གསལ་གི་མགོ་ཡིག་ཅིག་བà½à½„་ཡོདà¼" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "མགོ་ཡིག་གི་གྲལ་à½à½²à½‚་བྱང་ཉེསà¼" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "ཨེཆི་à½à½²à¼‹à½à½²à¼‹à½”ི་སར་བར་འདི་གིས་ནུས་མེད་ནང་དོན་རིང་-à½à½‘་ཀྱི་མགོ་ཡིག་ཅིག་བà½à½„་ཡོདà¼" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "ཨེཆི་à½à½²à¼‹à½à½²à¼‹à½”ི་ སར་བར་འདི་གིས་ ནུས་མེད་ ནང་དོན་-à½à¾±à½–་à½à½‘་ཀྱི་མགོ་ཡིག་ཅིག་བà½à½„་ཡོདà¼" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "འ་ནི་ ཨེཆི་à½à½²à¼‹à½à½²à¼‹à½”ི་ སར་བར་འདི་གིས་ à½à¾±à½–་à½à½‘་ཀྱི་རྒྱབ་སà¾à¾±à½¼à½¢à¼‹à½‘ེ་ཆད་པ་བཟོ་བà½à½„་ནུག" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "མ་ཤེས་པའི་à½à½ºà½¦à¼‹à½¢à¾©à¼‹à½¦à¾’ྲིག" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེསà¼" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "བà½à½´à½‘་ལམ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "ནང་འà½à½¼à½‘་འཛོལ་བà¼" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3710,57 +3749,17 @@ msgstr "ཆུ་à½à½¼à½‘་ལེགས་བཅོས་གà½à½²à¼‹à½¦à¾’ྲ msgid "Connection closed prematurely" msgstr "དུས་སུ་མ་འབབ་པ་རང་མà½à½´à½‘་ལམ་འདི་ག་བསྡམས་ཡོདà¼" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "མགོ་ཡིག་à½à½´à¼‹à½‚ི་དོན་ལུ་བསྒ྄ག་དོà¼" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "ཨེཆི་à½à½²à¼‹à½à½²à¼‹à½”ི་ སར་བར་འདི་གིས་ནུས་མེད་ལན་གསལ་གི་མགོ་ཡིག་ཅིག་བà½à½„་ཡོདà¼" - -#: methods/server.cc -msgid "Bad header line" -msgstr "མགོ་ཡིག་གི་གྲལ་à½à½²à½‚་བྱང་ཉེསà¼" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "ཨེཆི་à½à½²à¼‹à½à½²à¼‹à½”ི་སར་བར་འདི་གིས་ནུས་མེད་ནང་དོན་རིང་-à½à½‘་ཀྱི་མགོ་ཡིག་ཅིག་བà½à½„་ཡོདà¼" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "ཨེཆི་à½à½²à¼‹à½à½²à¼‹à½”ི་ སར་བར་འདི་གིས་ ནུས་མེད་ ནང་དོན་-à½à¾±à½–་à½à½‘་ཀྱི་མགོ་ཡིག་ཅིག་བà½à½„་ཡོདà¼" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "འ་ནི་ ཨེཆི་à½à½²à¼‹à½à½²à¼‹à½”ི་ སར་བར་འདི་གིས་ à½à¾±à½–་à½à½‘་ཀྱི་རྒྱབ་སà¾à¾±à½¼à½¢à¼‹à½‘ེ་ཆད་པ་བཟོ་བà½à½„་ནུག" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "མ་ཤེས་པའི་à½à½ºà½¦à¼‹à½¢à¾©à¼‹à½¦à¾’ྲིག" - -#: methods/server.cc -msgid "Bad header data" -msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེསà¼" - -#: methods/server.cc -msgid "Connection failed" -msgstr "བà½à½´à½‘་ལམ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "ནང་འà½à½¼à½‘་འཛོལ་བà¼" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "མ་à½à½„་པའི་རྟེན་འབྲེལ་à½à½´à¼ --fix-broken ལག་ལེན་འà½à½–་སྟེ་འབད་རྩོལ་བསà¾à¾±à½ºà½‘à¼" + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "འདི་à½à½´à¼‹à½“ོར་བཅོས་འབད་ནིའི་དོན་ལུ་à½à¾±à½¼à½‘་ཀྱི་'apt --fix-broken install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:" + #~ msgid "(not found)" #~ msgstr "(མ་à½à½¼à½–à¼)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -419,8 +419,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1630,15 +1630,19 @@ msgstr "ΑδÏνατη η ελαχιστοποίηση του συνόλου αΠmsgid " Done" msgstr " Ετοιμο" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "" -"Îσως να Ï€ÏÎπει να Ï„ÏÎξετε apt-get -f install για να διοÏθÏσετε αυτά τα " +"Îσως να Ï€ÏÎπει να Ï„ÏÎξετε apt --fix-broken install για να διοÏθÏσετε αυτά τα " "Ï€Ïοβλήματα." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Ανεπίλυτες εξαÏτήσεις. Δοκιμάστε με το -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Ανεπίλυτες εξαÏτήσεις. Δοκιμάστε 'apt --fix-broken install' χωÏίς να οÏίσετε " +"πακÎτο (ή καθοÏίστε μια λÏση)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1824,6 +1828,14 @@ msgid "Broken packages" msgstr "ΧαλασμÎνα πακÎτα" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"ΑδÏνατη η μεταφόÏτωση μεÏικÏν αÏχείων, ίσως αν δοκιμάζατε με apt-get update " +"ή το --fix-missing;" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "ΕσωτεÏικό σφάλμα, Îγινε κλήση του Install Packages με σπασμÎνα πακÎτα!" @@ -1927,14 +1939,6 @@ msgid "Download complete and in download only mode" msgstr "ΟλοκληÏÏθηκε η μεταφόÏτωση μόνο" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"ΑδÏνατη η μεταφόÏτωση μεÏικÏν αÏχείων, ίσως αν δοκιμάζατε με apt-get update " -"ή το --fix-missing;" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "" "ο συνδυασμός --fix-missing με εναλλαγή μÎσων δεν υποστηÏίζεται για την ÏÏα" @@ -2006,18 +2010,6 @@ msgstr[0] "ΧÏησιμοποιήστε '%s' για να το διαγÏάψετ msgstr[1] "ΧÏησιμοποιήστε '%s' για να τα διαγÏάψετε." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Aν Ï„ÏÎξετε 'apt-get -f install' ίσως να διοÏθÏσετε αυτά τα Ï€Ïοβλήματα:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Ανεπίλυτες εξαÏτήσεις. Δοκιμάστε 'apt-get -f install' χωÏίς να οÏίσετε " -"πακÎτο (ή καθοÏίστε μια λÏση)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Τα ακόλουθα επιπλÎον πακÎτα θα εγκατασταθοÏν:" @@ -2403,7 +2395,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "ΑπÎτυχε η εντολή αποσυμπίεσης %s\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ΕλÎγξτε αν είναι εγκαταστημÎνο το πακÎτο 'dpkg-dev'.\n" @@ -3382,6 +3373,53 @@ msgstr " %s δεν Îχει εγγÏαφή πηγαίας παÏάκαμψης\ msgid " %s has no binary override entry either\n" msgstr " %s δεν Îχει οÏτε εγγÏαφή δυαδικής παÏάκαμψης\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Αναμονή επικεφαλίδων" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "Ο διακομιστής http Îστειλε μια άκυÏη επικεφαλίδα απάντησης" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Ελαττωματική γÏαμμή επικεφαλίδας" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "Ο διακομιστής http Îστειλε μια άκυÏη επικεφαλίδα Content-Length" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "Ο διακομιστής http Îστειλε μια άκυÏη επικεφαλίδα Content-Range" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Ο διακομιστής http δεν υποστηÏίζει πλήÏως το range" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Άγνωστη μοÏφή ημεÏομηνίας" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Ελαττωματικά δεδομÎνα επικεφαλίδας" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Η σÏνδεση απÎτυχε" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "ΕσωτεÏικό Σφάλμα" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3739,57 +3777,18 @@ msgstr "Αποτυχία οÏÎ¹ÏƒÎ¼Î¿Ï Ï„Î¿Ï… χÏόνου Ï„Ïοποποίησ msgid "Connection closed prematurely" msgstr "Η σÏνδεση Îκλεισε Ï€ÏόωÏα" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Αναμονή επικεφαλίδων" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "Ο διακομιστής http Îστειλε μια άκυÏη επικεφαλίδα απάντησης" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Ελαττωματική γÏαμμή επικεφαλίδας" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Ο διακομιστής http Îστειλε μια άκυÏη επικεφαλίδα Content-Length" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Ο διακομιστής http Îστειλε μια άκυÏη επικεφαλίδα Content-Range" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Ο διακομιστής http δεν υποστηÏίζει πλήÏως το range" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Άγνωστη μοÏφή ημεÏομηνίας" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Ελαττωματικά δεδομÎνα επικεφαλίδας" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Η σÏνδεση απÎτυχε" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "ΕσωτεÏικό Σφάλμα" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "Ανεπίλυτες εξαÏτήσεις. Δοκιμάστε με το --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "Aν Ï„ÏÎξετε 'apt --fix-broken install' ίσως να διοÏθÏσετε αυτά τα " +#~ "Ï€Ïοβλήματα:" + #~ msgid "(not found)" #~ msgstr "(δε βÏÎθηκαν)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\n" "PO-Revision-Date: 2016-01-26 01:51+0100\n" "Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox." "org>\n" @@ -490,10 +490,13 @@ msgstr "" "privilegios" #: apt-pkg/acquire.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Can't drop privileges for downloading as file '%s' couldn't be accessed " +#| "by user '%s'." msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" "No se podrĂ¡n ignorar los privilegios para descargar mientras no se pueda " "acceder a «%s» con el usuario «%s»." @@ -1763,13 +1766,17 @@ msgstr "No se puede minimizar el conjunto de actualizaciĂ³n" msgid " Done" msgstr " Listo" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "Tal vez quiera ejecutar «apt --fix-broken install» para corregirlo." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Dependencias incumplidas. Pruebe de nuevo utilizando -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Dependencias incumplidas. Intente «apt --fix-broken install» sin paquetes (o " +"especifique una soluciĂ³n)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1961,6 +1968,14 @@ msgid "Broken packages" msgstr "Paquetes rotos" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"No se pudieron obtener algunos archivos, ¿quizĂ¡s deba ejecutar «apt-get " +"update» o deba intentarlo de nuevo con --fix-missing?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Error interno, ¡se llamĂ³ a «InstallPackages» con paquetes rotos!" @@ -2069,14 +2084,6 @@ msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de solo descarga" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"No se pudieron obtener algunos archivos, ¿quizĂ¡s deba ejecutar «apt-get " -"update» o deba intentarlo de nuevo con --fix-missing?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "Actualmente no se admite --fix-missing ni intercambio de medio" @@ -2153,18 +2160,6 @@ msgstr[0] "Utilice «%s» para eliminarlo." msgstr[1] "Utilice «%s» para eliminarlos." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Dependencias incumplidas. Intente «apt-get -f install» sin paquetes (o " -"especifique una soluciĂ³n)." - -#: apt-private/private-install.cc msgid "The following additional packages will be installed:" msgstr "Se instalarĂ¡n los siguientes paquetes adicionales:" @@ -2554,7 +2549,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "FallĂ³ la orden de desempaquetamiento «%s».\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Compruebe que el paquete «dpkg-dev» estĂ© instalado.\n" @@ -3563,6 +3557,55 @@ msgstr " %s no tiene una entrada fuente predominante\n" msgid " %s has no binary override entry either\n" msgstr " %s tampoco tiene una entrada binaria predominante\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Esperando las cabeceras" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "El servidor de http enviĂ³ una cabecera de respuesta invĂ¡lida" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "LĂnea de cabecera incorrecta" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "El servidor de http enviĂ³ una cabecera de «Content-Length» invĂ¡lida" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "El servidor de http enviĂ³ una cabecera de «Content-Range» invĂ¡lida" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Este servidor de http admite alcance roto" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Formato de fecha desconocido" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Datos de cabecera incorrectos" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "FallĂ³ la conexiĂ³n" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" +"Se ha deshabilitado automĂ¡ticamente %s debido a una respuesta incorrecta del " +"servidor/proxy. (man 5 apt.conf)" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Error interno" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3920,59 +3963,16 @@ msgstr "Fallo al establecer el tiempo de modificaciĂ³n" msgid "Connection closed prematurely" msgstr "La conexiĂ³n se cerrĂ³ prematuramente" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Esperando las cabeceras" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "El servidor de http enviĂ³ una cabecera de respuesta invĂ¡lida" - -#: methods/server.cc -msgid "Bad header line" -msgstr "LĂnea de cabecera incorrecta" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "El servidor de http enviĂ³ una cabecera de «Content-Length» invĂ¡lida" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "El servidor de http enviĂ³ una cabecera de «Content-Range» invĂ¡lida" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Este servidor de http admite alcance roto" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Formato de fecha desconocido" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Datos de cabecera incorrectos" - -#: methods/server.cc -msgid "Connection failed" -msgstr "FallĂ³ la conexiĂ³n" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" -"Se ha deshabilitado automĂ¡ticamente %s debido a una respuesta incorrecta del " -"servidor/proxy. (man 5 apt.conf)" - -#: methods/server.cc -msgid "Internal error" -msgstr "Error interno" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "Los ficheros vacĂos no pueden ser archivos vĂ¡lidos" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "Dependencias incumplidas. Pruebe de nuevo utilizando --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "Tal vez quiera ejecutar «apt --fix-broken install» para corregirlo:" + #~ msgid "(not found)" #~ msgstr "(no encontrado)" @@ -4559,11 +4559,11 @@ msgstr "Los ficheros vacĂos no pueden ser archivos vĂ¡lidos" #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies.\n" -#~ "You might want to run 'apt-get -f install' to correct these." +#~ "You might want to run 'apt --fix-broken install' to correct these." #~ msgstr "" #~ "Se encontraron algunos paquetes rotos mientras se intentaba procesar\n" #~ "las dependencies de construcciĂ³n. Tal vez quiera ejecutar \n" -#~ "'apt-get -f install' para corregirlos." +#~ "'apt --fix-broken install' para corregirlos." #~ msgid "" #~ "Usage: apt-cache [options] command\n" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -408,8 +408,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1611,13 +1611,17 @@ msgstr "Ezin da bertsio berritzeko multzoa minimizatu" msgid " Done" msgstr " Eginda" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "Beharbada 'apt --fix-broken install' exekutatu nahiko duzu zuzentzeko." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Bete gabeko mendekotasunak. Probatu 'apt --fix-broken install' paketerik " +"gabe (edo zehaztu konponbide bat)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1802,6 +1806,14 @@ msgid "Broken packages" msgstr "Hautsitako paketeak" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo " +"--fix-missing aukerarekin saiatu?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!" @@ -1903,14 +1915,6 @@ msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo " -"--fix-missing aukerarekin saiatu?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing eta euskarri aldaketa ez dira onartzen oraingoz" @@ -1986,18 +1990,6 @@ msgstr[0] "'%s' erabili ezabatzeko." msgstr[1] "'%s' erabili ezabatzeko." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " -"zehaztu konponbide bat)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" @@ -2380,7 +2372,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" @@ -3348,6 +3339,53 @@ msgstr " %s: ez du jatorri gainidazketa sarrerarik\n" msgid " %s has no binary override entry either\n" msgstr " %s: ez du bitar gainidazketa sarrerarik\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Goiburuen zain" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "http zerbitzariak erantzun goiburu baliogabe bat bidali du." + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Okerreko goiburu-lerroa" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "http zerbitzariak barruti onarpena apurturik du" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Datu formatu ezezaguna" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Goiburu data gaizki dago" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Konexioak huts egin du" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Barne errorea" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3706,57 +3744,18 @@ msgstr "Huts egin du aldaketa ordua ezartzean" msgid "Connection closed prematurely" msgstr "Konexioa behar baino lehenago itxi da" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Goiburuen zain" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "http zerbitzariak erantzun goiburu baliogabe bat bidali du." - -#: methods/server.cc -msgid "Bad header line" -msgstr "Okerreko goiburu-lerroa" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "http zerbitzariak barruti onarpena apurturik du" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Datu formatu ezezaguna" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Goiburu data gaizki dago" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Konexioak huts egin du" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Barne errorea" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "Bete gabeko mendekotasunak. Probatu --fix-broken erabiliz." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "Beharbada 'apt --fix-broken install' exekutatu nahiko duzu hauek " +#~ "zuzentzeko:" + #~ msgid "(not found)" #~ msgstr "(ez da aurkitu)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -408,8 +408,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1606,13 +1606,17 @@ msgstr "Päivitysjoukon minimointi ei onnistu" msgid " Done" msgstr " Valmis" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "Halunnet suorittaa \"apt --fix-broken install\" korjaamaan nämä." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt --fix-broken install" +"\" ilmanpaketteja (tai ratkaise itse)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1796,6 +1800,14 @@ msgid "Broken packages" msgstr "Rikkinäiset paketit" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai " +"kokeile --fix-missing?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!" @@ -1897,14 +1909,6 @@ msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai " -"kokeile --fix-missing?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu" @@ -1981,18 +1985,6 @@ msgstr[0] "Poista ne komennolla \"%s\"." msgstr[1] "Poista ne komennolla \"%s\"." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " -"ilmanpaketteja (tai ratkaise itse)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" @@ -2372,7 +2364,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" @@ -3344,6 +3335,53 @@ msgstr " %s:llä ei ole poikkeustietuetta\n" msgid " %s has no binary override entry either\n" msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Odotetaan otsikoita" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Virheellinen otsikkorivi" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "HTTP-palvelimen arvoaluetuki on rikki" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Tuntematon päiväysmuoto" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Virheellinen otsikkotieto" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Yhteys ei toiminut" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Sisäinen virhe" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3698,57 +3736,17 @@ msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" msgid "Connection closed prematurely" msgstr "Yhteys katkesi ennenaikaisesti" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Odotetaan otsikoita" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Virheellinen otsikkorivi" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "HTTP-palvelimen arvoaluetuki on rikki" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Tuntematon päiväysmuoto" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Virheellinen otsikkotieto" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Yhteys ei toiminut" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Sisäinen virhe" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "Saatat haluta suorittaa \"apt --fix-broken install\" korjaamaan nämä:" + #~ msgid "(not found)" #~ msgstr "(ei löydy)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\n" "PO-Revision-Date: 2013-12-15 16:45+0100\n" "Last-Translator: Julien Patriarca <leatherface@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -422,8 +422,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1696,13 +1696,19 @@ msgstr "Impossible de minimiser le nombre des paquets mis Ă jour" msgid " Done" msgstr " Fait" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "" +"Vous pouvez lancer « apt --fix-broken install » pour corriger ces problèmes." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "DĂ©pendances manquantes. Essayez d'utiliser l'option -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"DĂ©pendances non satisfaites. Essayez « apt --fix-broken install » sans " +"paquet\n" +"(ou indiquez une solution)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1889,6 +1895,14 @@ msgid "Broken packages" msgstr "Paquets dĂ©fectueux" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Impossible de rĂ©cupĂ©rer certaines archives, peut-Ăªtre devrez-vous lancer apt-" +"get update ou essayer avec --fix-missing ?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erreur interne, « InstallPackages » appelĂ© avec des paquets cassĂ©s." @@ -1997,14 +2011,6 @@ msgid "Download complete and in download only mode" msgstr "TĂ©lĂ©chargement achevĂ© et dans le mode tĂ©lĂ©chargement uniquement" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Impossible de rĂ©cupĂ©rer certaines archives, peut-Ăªtre devrez-vous lancer apt-" -"get update ou essayer avec --fix-missing ?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "" "l'option --fix-missing et l'Ă©change de support ne sont pas encore reconnus." @@ -2086,19 +2092,6 @@ msgstr[0] "Veuillez utiliser « %s » pour le supprimer." msgstr[1] "Veuillez utiliser « %s » pour les supprimer." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "" -"Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"DĂ©pendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" -"(ou indiquez une solution)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Les paquets supplĂ©mentaires suivants seront installĂ©s : " @@ -2493,7 +2486,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "La commande de dĂ©compactage « %s » a Ă©chouĂ©.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Veuillez vĂ©rifier si le paquet dpkg-dev est installĂ©.\n" @@ -3489,6 +3481,53 @@ msgstr " %s ne possède pas d'entrĂ©e « source override »\n" msgid " %s has no binary override entry either\n" msgstr " %s ne possède pas Ă©galement pas d'entrĂ©e « binary override »\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Attente des fichiers d'en-tĂªte" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "Le serveur http a envoyĂ© une rĂ©ponse dont l'en-tĂªte est invalide" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Mauvaise ligne d'en-tĂªte" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "Le serveur http a envoyĂ© un en-tĂªte « Content-Length » invalide" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "Le serveur http a envoyĂ© un en-tĂªte « Content-Range » invalide" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Ce serveur http possède un support des limites non-valide" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Format de date inconnu" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Mauvais en-tĂªte de donnĂ©e" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Échec de la connexion" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Erreur interne" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3852,57 +3891,18 @@ msgstr "Impossible de modifier l'heure " msgid "Connection closed prematurely" msgstr "Connexion fermĂ©e prĂ©maturĂ©ment" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Attente des fichiers d'en-tĂªte" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "Le serveur http a envoyĂ© une rĂ©ponse dont l'en-tĂªte est invalide" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Mauvaise ligne d'en-tĂªte" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Le serveur http a envoyĂ© un en-tĂªte « Content-Length » invalide" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Le serveur http a envoyĂ© un en-tĂªte « Content-Range » invalide" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Ce serveur http possède un support des limites non-valide" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Format de date inconnu" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Mauvais en-tĂªte de donnĂ©e" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Échec de la connexion" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Erreur interne" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "Les fichiers vides ne peuvent Ăªtre des archives valables" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "DĂ©pendances manquantes. Essayez d'utiliser l'option --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "Vous pouvez lancer « apt --fix-broken install » pour corriger ces " +#~ "problèmes :" + #~ msgid "(not found)" #~ msgstr "(non trouvĂ©)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -417,8 +417,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1664,13 +1664,17 @@ msgstr "Non foi posĂbel minimizar o conxunto de anovaciĂ³ns" msgid " Done" msgstr " Feito" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Pode querer executar «apt-get -f install» para corrixilos." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "Pode querer executar «apt --fix-broken install» para corrixilos." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Dependencias incumpridas. Probe a empregar -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Dependencias incumpridas. Probe «apt --fix-broken install» sen paquetes (ou " +"especifique unha soluciĂ³n)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1855,6 +1859,14 @@ msgid "Broken packages" msgstr "Paquetes estragados" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Non foi posĂbel obter algĂºns arquivos; probe con apt-get update ou --fix-" +"missing." + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Produciuse un erro interno, chamouse a InstallPackages con paquetes " @@ -1958,14 +1970,6 @@ msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de sĂ³ descargas" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Non foi posĂbel obter algĂºns arquivos; probe con apt-get update ou --fix-" -"missing." - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "" "O emprego conxunto de --fix-missing e intercambio de discos non estĂ¡ admitido" @@ -2043,18 +2047,6 @@ msgstr[0] "Empregue «%s» para eliminalos." msgstr[1] "Empregue «%s» para eliminalos." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Pode querer executar «apt-get -f install» para corrixir isto:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Dependencias incumpridas. Probe «apt-get -f install» sen paquetes (ou " -"especifique unha soluciĂ³n)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Instalaranse os seguintes paquetes extra:" @@ -2445,7 +2437,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetado «%s».\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n" @@ -3416,6 +3407,54 @@ msgstr " %s non ten unha entrada de «override» de cĂ³digo fonte\n" msgid " %s has no binary override entry either\n" msgstr " %s tampouco ten unha entrada de «override» de binarios\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Agardando polas cabeceiras" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "O servidor HTTP enviou unha cabeceira de resposta incorrecta" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Liña de cabeceira incorrecta" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "" +"O servidor HTTP enviou unha cabeceira cunha lonxitude de contido incorrecta" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "O servidor HTTP enviou unha cabeceira cun rango de contido incorrecto" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Este servidor HTTP ten a compatibilidade de rangos estragada" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Formato de datos descoñecido" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Datos da cabeceira incorrectos" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Produciuse un fallo na conexiĂ³n" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Produciuse un erro interno" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3773,58 +3812,16 @@ msgstr "Non foi posĂbel estabelecer a hora de modificaciĂ³n" msgid "Connection closed prematurely" msgstr "A conexiĂ³n pechouse prematuramente" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Agardando polas cabeceiras" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "O servidor HTTP enviou unha cabeceira de resposta incorrecta" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Liña de cabeceira incorrecta" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "" -"O servidor HTTP enviou unha cabeceira cunha lonxitude de contido incorrecta" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "O servidor HTTP enviou unha cabeceira cun rango de contido incorrecto" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Este servidor HTTP ten a compatibilidade de rangos estragada" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Formato de datos descoñecido" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Datos da cabeceira incorrectos" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Produciuse un fallo na conexiĂ³n" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Produciuse un erro interno" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "Os ficheiros baleiros non poden ser arquivadores vĂ¡lidos" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "Dependencias incumpridas. Probe a empregar --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "Pode querer executar «apt --fix-broken install» para corrixir isto:" + #~ msgid "(not found)" #~ msgstr "(non se atopou)" @@ -668,12 +668,12 @@ msgid " Done" msgstr "סיו×" #: cmdline/apt-get.cc:684 -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "×ולי תרצה להריץ 'apt-get -f install' כדי לתקן ×ת ×לו." +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "×ולי תרצה להריץ 'apt --fix-broken install' כדי לתקן ×ת ×לו." #: cmdline/apt-get.cc:687 -msgid "Unmet dependencies. Try using -f." -msgstr "תלויות ×©×œ× × ×¢× ×•. × ×¡×” להשת×ש ב×פשרות -f." +msgid "Unmet dependencies. Try using --fix-broken." +msgstr "תלויות ×©×œ× × ×¢× ×•. × ×¡×” להשת×ש ב×פשרות --fix-broken." #: cmdline/apt-get.cc:712 #, fuzzy @@ -972,12 +972,12 @@ msgid "%s set to manually installed.\n" msgstr "×בל %s הולכת להיות ××•×ª×§× ×ª" #: cmdline/apt-get.cc:1784 -msgid "You might want to run 'apt-get -f install' to correct these:" +msgid "You might want to run 'apt --fix-broken install' to correct these:" msgstr "" #: cmdline/apt-get.cc:1787 msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or specify a " "solution)." msgstr "" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -429,10 +429,13 @@ msgid "No sandbox user '%s' on the system, can not drop privileges" msgstr "Nincs â€%s†felhasznĂ¡lĂ³ a rendszeren, a jogosultsĂ¡gok nem dobhatĂ³k el" #: apt-pkg/acquire.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Can't drop privileges for downloading as file '%s' couldn't be accessed " +#| "by user '%s'." msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" "Nem dobhatĂ³k el a jogosultsĂ¡gok a letöltĂ©shez, mivel a(z) â€%s†fĂ¡jl nem " "Ă©rhetÅ‘ el a felhasznĂ¡lĂ³ (â€%sâ€) Ă¡ltal." @@ -1685,13 +1688,18 @@ msgstr "Nem lehet minimalizĂ¡lni a frissĂtendÅ‘ csomagok mennyisĂ©gĂ©t" msgid " Done" msgstr " KĂ©sz" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "PrĂ³bĂ¡lja futtatni az â€apt-get -f install†parancsot ezek javĂtĂ¡sĂ¡hoz." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "" +"PrĂ³bĂ¡lja futtatni az â€apt --fix-broken install†parancsot ezek javĂtĂ¡sĂ¡hoz." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "TeljesĂtetlen fĂ¼ggÅ‘sĂ©gek. PrĂ³bĂ¡lja a -f hasznĂ¡latĂ¡val." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"TeljesĂtetlen fĂ¼ggÅ‘sĂ©gek. PrĂ³bĂ¡lja kiadni az â€apt --fix-broken install†" +"parancsot csomagok nĂ©lkĂ¼l (vagy telepĂtse a fĂ¼ggÅ‘sĂ©geket is!)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1882,6 +1890,14 @@ msgid "Broken packages" msgstr "Törött csomagok" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Nem lehet letölteni nĂ©hĂ¡ny archĂvumot. PrĂ³bĂ¡lja futtatni az â€apt-get update†" +"parancsot, vagy hasznĂ¡lja a --fix-missing kapcsolĂ³t." + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "BelsÅ‘ hiba, az InstallPackages törött csomagokkal lett meghĂvva!" @@ -1985,14 +2001,6 @@ msgid "Download complete and in download only mode" msgstr "A letöltĂ©s befejezÅ‘dött a â€csak letöltĂ©s†mĂ³dban" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Nem lehet letölteni nĂ©hĂ¡ny archĂvumot. PrĂ³bĂ¡lja futtatni az â€apt-get update†" -"parancsot, vagy hasznĂ¡lja a --fix-missing kapcsolĂ³t." - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "A --fix-missing Ă©s az adathordozĂ³-csere jelenleg nem tĂ¡mogatott" @@ -2067,19 +2075,6 @@ msgstr[0] "Ezt az â€%s†paranccsal törölheti." msgstr[1] "Ezeket az â€%s†paranccsal törölheti." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "" -"PrĂ³bĂ¡lja futtatni az â€apt-get -f install†parancsot az alĂ¡bbiak javĂtĂ¡sĂ¡hoz:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"TeljesĂtetlen fĂ¼ggÅ‘sĂ©gek. PrĂ³bĂ¡lja kiadni az â€apt-get -f install†parancsot " -"csomagok nĂ©lkĂ¼l (vagy telepĂtse a fĂ¼ggÅ‘sĂ©geket is!)." - -#: apt-private/private-install.cc msgid "The following additional packages will be installed:" msgstr "A következÅ‘ tovĂ¡bbi csomagok lesznek telepĂtve:" @@ -2470,7 +2465,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "â€%s†kibontĂ¡si parancs nem sikerĂ¼lt.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "EllenÅ‘rizze, hogy a â€dpkg-dev†csomag telepĂtve van-e.\n" @@ -3459,6 +3453,55 @@ msgstr " %s nem rendelkezik forrĂ¡s-felĂ¼lbĂrĂ¡lĂ³ bejegyzĂ©ssel\n" msgid " %s has no binary override entry either\n" msgstr " %s nem rendelkezik binĂ¡ris-felĂ¼lbĂrĂ¡lĂ³ bejegyzĂ©ssel sem\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "VĂ¡rakozĂ¡s a fejlĂ©cekre" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "A HTTP-kiszolgĂ¡lĂ³ Ă©rvĂ©nytelen vĂ¡laszfejlĂ©cet kĂ¼ldött" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Rossz fejlĂ©csor" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "A HTTP-kiszolgĂ¡lĂ³ Ă©rvĂ©nytelen Content-Length fejlĂ©cet kĂ¼ldött" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "A HTTP-kiszolgĂ¡lĂ³ Ă©rvĂ©nytelen Content-Range fejlĂ©cet kĂ¼ldött" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "A HTTP-kiszolgĂ¡lĂ³ tartomĂ¡nytĂ¡mogatĂ¡sa sĂ©rĂ¼lt" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Ismeretlen dĂ¡tumformĂ¡tum" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Rossz fejlĂ©cadatok" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Sikertelen kapcsolĂ³dĂ¡s" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" +"%s automatikusan letiltva, mert hibĂ¡s vĂ¡lasz Ă©rkezett a kiszolgĂ¡lĂ³tĂ³l/" +"proxytĂ³l. (lĂ¡sd: man 5 apt.conf)" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "BelsÅ‘ hiba" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3818,59 +3861,18 @@ msgstr "A mĂ³dosĂtĂ¡si idÅ‘ beĂ¡llĂtĂ¡sa sikertelen" msgid "Connection closed prematurely" msgstr "A kapcsolat idÅ‘ elÅ‘tt lezĂ¡rult" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "VĂ¡rakozĂ¡s a fejlĂ©cekre" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "A HTTP-kiszolgĂ¡lĂ³ Ă©rvĂ©nytelen vĂ¡laszfejlĂ©cet kĂ¼ldött" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Rossz fejlĂ©csor" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "A HTTP-kiszolgĂ¡lĂ³ Ă©rvĂ©nytelen Content-Length fejlĂ©cet kĂ¼ldött" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "A HTTP-kiszolgĂ¡lĂ³ Ă©rvĂ©nytelen Content-Range fejlĂ©cet kĂ¼ldött" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "A HTTP-kiszolgĂ¡lĂ³ tartomĂ¡nytĂ¡mogatĂ¡sa sĂ©rĂ¼lt" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Ismeretlen dĂ¡tumformĂ¡tum" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Rossz fejlĂ©cadatok" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Sikertelen kapcsolĂ³dĂ¡s" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" -"%s automatikusan letiltva, mert hibĂ¡s vĂ¡lasz Ă©rkezett a kiszolgĂ¡lĂ³tĂ³l/" -"proxytĂ³l. (lĂ¡sd: man 5 apt.conf)" - -#: methods/server.cc -msgid "Internal error" -msgstr "BelsÅ‘ hiba" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "Az Ă¼res fĂ¡jlok biztosan nem Ă©rvĂ©nyes csomagok" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "TeljesĂtetlen fĂ¼ggÅ‘sĂ©gek. PrĂ³bĂ¡lja a --fix-broken hasznĂ¡latĂ¡val." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "PrĂ³bĂ¡lja futtatni az â€apt --fix-broken install†parancsot az alĂ¡bbiak " +#~ "javĂtĂ¡sĂ¡hoz:" + #~ msgid "(not found)" #~ msgstr "(nem talĂ¡lhatĂ³)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\n" "PO-Revision-Date: 2015-04-07 16:51+0100\n" "Last-Translator: Milo Casagrande <milo@milo.name>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -420,8 +420,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1685,13 +1685,17 @@ msgstr "Impossibile minimizzare l'insieme da aggiornare" msgid " Done" msgstr " Fatto" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Ăˆ utile eseguire \"apt-get -f install\" per correggere ciĂ²." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "Ăˆ utile eseguire \"apt --fix-broken install\" per correggere ciĂ²." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Dipendenze non trovate. Riprovare usando -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Dipendenze non soddisfatte. Provare \"apt --fix-broken install\" senza " +"pacchetti (o specificare una soluzione)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1877,6 +1881,14 @@ msgid "Broken packages" msgstr "Pacchetti danneggiati" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Impossibile scaricare alcuni pacchetti. Potrebbe essere utile eseguire \"apt-" +"get update\" o provare l'opzione \"--fix-missing\"." + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Errore interno, InstallPackages è stato chiamato con un pacchetto " @@ -1982,14 +1994,6 @@ msgid "Download complete and in download only mode" msgstr "Scaricamento completato e in modalitĂ solo scaricamento" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Impossibile scaricare alcuni pacchetti. Potrebbe essere utile eseguire \"apt-" -"get update\" o provare l'opzione \"--fix-missing\"." - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing su supporti estraibili non è ancora supportato" @@ -2068,19 +2072,6 @@ msgstr[0] "Usare \"%s\" per rimuoverlo." msgstr[1] "Usare \"%s\" per rimuoverli." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "" -"Ăˆ utile eseguire \"apt-get -f install\" per correggere questi problemi:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti " -"(o specificare una soluzione)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "I seguenti pacchetti saranno inoltre installati:" @@ -2473,7 +2464,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione \"%s\" non riuscito.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n" @@ -3466,6 +3456,53 @@ msgstr " %s non ha un campo source override\n" msgid " %s has no binary override entry either\n" msgstr " %s non ha neppure un campo binario override\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "In attesa degli header" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "Il server HTTP ha inviato un header di risposta non valido" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Riga header non corretta" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "Il server HTTP ha inviato un header Content-Length non valido" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "Il server HTTP ha inviato un header Content-Range non valido" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Questo server HTTP ha un supporto del range non corretto" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Formato della data sconosciuto" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Header dati non corretto" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Connessione non riuscita" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Errore interno" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3826,57 +3863,18 @@ msgstr "Impostazione della data di modifica non riuscita" msgid "Connection closed prematurely" msgstr "Connessione chiusa prematuramente" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "In attesa degli header" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "Il server HTTP ha inviato un header di risposta non valido" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Riga header non corretta" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Il server HTTP ha inviato un header Content-Length non valido" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Il server HTTP ha inviato un header Content-Range non valido" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Questo server HTTP ha un supporto del range non corretto" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Formato della data sconosciuto" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Header dati non corretto" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Connessione non riuscita" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Errore interno" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "File vuoti non possono essere archivi validi" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "Dipendenze non trovate. Riprovare usando --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "Ăˆ utile eseguire \"apt --fix-broken install\" per correggere questi " +#~ "problemi:" + #~ msgid "(not found)" #~ msgstr "(non trovato)" @@ -1,4 +1,4 @@ -# Japanese mesasges for apt. +# Japanese messages for apt. # Copyright (C) 2001 Free Software Foundation, Inc. # Project Vine, Daisuke SUZUKI <daisuke@linux.or.jp>, 2001-2002 # Debian Project, Masato Taruishi <taru@debian.org>, 2002 @@ -8,10 +8,10 @@ # msgid "" msgstr "" -"Project-Id-Version: apt 1.0.9.3\n" +"Project-Id-Version: apt 1.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-11-25 23:46+0100\n" -"PO-Revision-Date: 2016-05-18 15:31+0900\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" "Language: ja\n" @@ -222,9 +222,9 @@ msgid "The repository '%s' is no longer signed." msgstr "ăƒªăƒă‚¸ăƒˆăƒª %s ă¯ă‚‚ă†ç½²åă•ă‚Œă¦ă„ă¾ă›ă‚“。" #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "The repository '%s' does no longer have a Release file." -msgstr "ăƒªăƒă‚¸ăƒˆăƒª %s ă«ă¯ Release ăƒ•ă‚¡ă‚¤ăƒ«ăŒă‚ă‚ă¾ă›ă‚“。" +msgstr "ăƒªăƒă‚¸ăƒˆăƒª %s ă«ă¯ Release ăƒ•ă‚¡ă‚¤ăƒ«ăŒăªăăªă£ă¦ă„ă¾ă™ă€‚" #: apt-pkg/acquire-item.cc msgid "" @@ -245,11 +245,9 @@ msgid "The repository '%s' does not have a Release file." msgstr "ăƒªăƒă‚¸ăƒˆăƒª %s ă«ă¯ Release ăƒ•ă‚¡ă‚¤ăƒ«ăŒă‚ă‚ă¾ă›ă‚“。" #: apt-pkg/acquire-item.cc -#, fuzzy, c-format +#, c-format msgid "The repository '%s' provides only weak security information." -msgstr "" -"ăƒªăƒă‚¸ăƒˆăƒª '%2$s' ă¯å¼±ă„ă‚»ă‚ăƒ¥ăƒªăƒ†ă‚£æƒ…å ±ă®ă¿ă‚’æä¾›ă—ă¦ă„ă‚‹ăŸă‚ă€è¨å®ăƒ•ă‚¡ă‚¤ăƒ« " -"'%1$s' ă®å–å¾—ă‚’ă‚¹ă‚ăƒƒăƒ—ă—ă¾ă™" +msgstr "ăƒªăƒă‚¸ăƒˆăƒª '%s' ă¯å¼±ă„ă‚»ă‚ăƒ¥ăƒªăƒ†ă‚£æƒ…å ±ă—ă‹æä¾›ă—ă¦ă„ă¾ă›ă‚“。" #: apt-pkg/acquire-item.cc ftparchive/writer.cc #, c-format @@ -262,7 +260,7 @@ msgstr "ăƒăƒƒă‚·ăƒ¥ă‚µăƒ ăŒé©åˆă—ă¾ă›ă‚“" #: apt-pkg/acquire-item.cc msgid "Insufficient information available to perform this download securely" -msgstr "" +msgstr "ă“ă®ăƒ€ă‚¦ăƒ³ăƒăƒ¼ăƒ‰ă‚’安全ă«å®Ÿæ–½ă™ă‚‹ă®ă«å分ăªæƒ…å ±ăŒå¾—ă‚‰ă‚Œă¾ă›ă‚“。" #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc #, c-format @@ -383,12 +381,13 @@ msgstr "%s=%s ă®ăŸă‚変更履æ´ăŒåˆ©ç”¨ă§ăă¾ă›ă‚“" #: apt-pkg/acquire-worker.cc #, c-format msgid "The method '%s' is explicitly disabled via configuration." -msgstr "" +msgstr "ăƒ¡ă‚½ăƒƒăƒ‰ '%s' ă¯è¨å®ă«ă‚ˆă‚ă¯ă£ăă‚ă¨ç„¡å¹ă«ă•ă‚Œă¦ă„ă¾ă™ă€‚" #: apt-pkg/acquire-worker.cc methods/connect.cc #, c-format msgid "If you meant to use Tor remember to use %s instead of %s." msgstr "" +"Tor ă‚’åˆ©ç”¨ă™ă‚‹å ´åˆă«ă¯ %2$s ă§ă¯ăªă %1$s ă‚’ä½¿ă†ă“ă¨ă‚’è¦ăˆă¦ăă„ă¦ăă ă•ă„。" #: apt-pkg/acquire-worker.cc #, c-format @@ -436,11 +435,11 @@ msgstr "ă‚·ă‚¹ăƒ†ăƒ ă«ă‚µăƒ³ăƒ‰ăƒœăƒƒă‚¯ă‚¹ăƒ¦ăƒ¼ă‚¶ '%s' ăŒă‚ă‚ă¾ă›ă‚“。 #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" -"ăƒ€ă‚¦ăƒ³ăƒăƒ¼ăƒ‰æ¨©é™ă‚’å‰é™¤ă§ăă¾ă›ă‚“ă€‚ăƒ•ă‚¡ă‚¤ăƒ« '%s' ăŒăƒ¦ăƒ¼ă‚¶ '%s' ă‹ă‚‰ă‚¢ă‚¯ă‚»ă‚¹ă§" -"ăă¾ă›ă‚“。" +"ăƒ•ă‚¡ă‚¤ăƒ« '%s' ăŒăƒ¦ăƒ¼ă‚¶ '%s' ă‹ă‚‰ă‚¢ă‚¯ă‚»ă‚¹ă§ăăªă„ăŸă‚ă€ăƒ€ă‚¦ăƒ³ăƒăƒ¼ăƒ‰ă¯ root ă§" +"ă‚µăƒ³ăƒ‰ăƒœăƒƒă‚¯ă‚¹ă‚’é€ă•ăă«è¡Œă‚ă‚Œă¾ă™ă€‚" #: apt-pkg/acquire.cc apt-pkg/clean.cc #, c-format @@ -1081,9 +1080,10 @@ msgstr "" "ă‚½ăƒ¼ă‚¹ %2$s %3$s (%4$s) ă«é–¢ă—ă¦ă‚ªăƒ—ă‚·ăƒ§ăƒ³ %1$s ă«è¨å®ă•ă‚ŒăŸå€¤ăŒç„¡å¹ă§ă™" #: apt-pkg/deb/debmetaindex.cc -#, fuzzy, c-format +#, c-format msgid "Conflicting values set for option %s regarding source %s %s: %s != %s" -msgstr "ă‚½ăƒ¼ă‚¹ %2$s %3$s ă«é–¢ă—ă¦ă‚ªăƒ—ă‚·ăƒ§ăƒ³ %1$s ă®å€¤ăŒç«¶åˆă—ă¾ă™" +msgstr "" +"ă‚½ăƒ¼ă‚¹ %2$s %3$s ă«é–¢ă—ă¦ă‚ªăƒ—ă‚·ăƒ§ăƒ³ %1$s ă®å€¤ăŒç«¶åˆă—ă¾ă™: %4$s != %5$s" #: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc #, c-format @@ -1309,24 +1309,20 @@ msgid "Execute external solver" msgstr "å¤–éƒ¨ă‚½ăƒ«ăƒă‚’実行" #: apt-pkg/edsp.cc -#, fuzzy msgid "Execute external planner" -msgstr "å¤–éƒ¨ă‚½ăƒ«ăƒă‚’実行" +msgstr "å¤–éƒ¨ăƒ—ăƒ©ăƒ³ăƒăƒ¼ă‚’実行" #: apt-pkg/edsp.cc -#, fuzzy msgid "Send request to planner" -msgstr "ă‚½ăƒ«ăƒă«ăƒªă‚¯ă‚¨ă‚¹ăƒˆă‚’é€ä¿¡" +msgstr "ăƒ—ăƒ©ăƒ³ăƒăƒ¼ă«ăƒªă‚¯ă‚¨ă‚¹ăƒˆă‚’é€ä¿¡" #: apt-pkg/edsp.cc -#, fuzzy msgid "Send scenario to planner" -msgstr "ă‚½ăƒ«ăƒă«ă‚·ăƒăƒªă‚ªă‚’é€ä¿¡" +msgstr "ăƒ—ăƒ©ăƒ³ăƒăƒ¼ă«ă‚·ăƒăƒªă‚ªă‚’é€ä¿¡" #: apt-pkg/edsp.cc -#, fuzzy msgid "External planner failed without a proper error message" -msgstr "å¤–éƒ¨ă‚½ăƒ«ăƒăŒé©åˆ‡ăªă‚¨ăƒ©ăƒ¼ăƒ¡ăƒƒă‚»ăƒ¼ă‚¸ăªă—ă«å¤±æ•—ă—ă¾ă—ăŸ" +msgstr "å¤–éƒ¨ăƒ—ăƒ©ăƒ³ăƒăƒ¼ăŒé©åˆ‡ăªă‚¨ăƒ©ăƒ¼ăƒ¡ăƒƒă‚»ăƒ¼ă‚¸ăªă—ă«å¤±æ•—ă—ă¾ă—ăŸ" #: apt-pkg/indexcopy.cc #, c-format @@ -1687,15 +1683,19 @@ msgstr "ă‚¢ăƒƒăƒ—ă‚°ăƒ¬ăƒ¼ăƒ‰ă‚»ăƒƒăƒˆă‚’æœ€å°åŒ–ă§ăă¾ă›ă‚“" msgid " Done" msgstr " 完了" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "" -"ă“ă‚Œă‚‰ă‚’ç›´ă™ăŸă‚ă«ă¯ 'apt-get -f install' ă‚’å®Ÿè¡Œă™ă‚‹å¿…è¦ăŒă‚ă‚‹ă‹ă‚‚ă—ă‚Œă¾ă›" -"ん。" +"ă“ă‚Œă‚‰ă‚’ç›´ă™ăŸă‚ă«ă¯ 'apt --fix-broken install' ă‚’å®Ÿè¡Œă™ă‚‹å¿…è¦ăŒă‚ă‚‹ă‹ă‚‚ă—ă‚Œ" +"ă¾ă›ă‚“。" -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "未解決ă®ä¾å˜é–¢ä¿‚ăŒă‚ă‚ă¾ă™ă€‚-f ă‚ªăƒ—ă‚·ăƒ§ăƒ³ă‚’è©¦ă—ă¦ăă ă•ă„。" +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"未解決ă®ä¾å˜é–¢ä¿‚ă§ă™ă€‚'apt --fix-broken install' ă‚’å®Ÿè¡Œă—ă¦ă¿ă¦ăă ă•ă„ (ă¾ăŸ" +"ă¯è§£æ³•ă‚’æ˜ç¤ºă—ă¦ăă ă•ă„)。" #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1887,6 +1887,14 @@ msgid "Broken packages" msgstr "å£ă‚ŒăŸăƒ‘ăƒƒă‚±ăƒ¼ă‚¸" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"ă„ăă¤ă‹ă®ă‚¢ăƒ¼ă‚«ă‚¤ăƒ–ă‚’å–å¾—ă§ăă¾ă›ă‚“。apt-get update ă‚’å®Ÿè¡Œă™ă‚‹ă‹ --fix-" +"missing ă‚ªăƒ—ă‚·ăƒ§ăƒ³ă‚’ä»˜ă‘ă¦è©¦ă—ă¦ă¿ă¦ăă ă•ă„。" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "å†…éƒ¨ă‚¨ăƒ©ăƒ¼ă€InstallPackages ăŒå£ă‚ŒăŸăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ă§å‘¼ă³å‡ºă•ă‚Œă¾ă—ăŸ!" @@ -1991,14 +1999,6 @@ msgid "Download complete and in download only mode" msgstr "ăƒ€ă‚¦ăƒ³ăƒăƒ¼ăƒ‰ă‚ªăƒ³ăƒªăƒ¼ăƒ¢ăƒ¼ăƒ‰ă§ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ă®ăƒ€ă‚¦ăƒ³ăƒăƒ¼ăƒ‰ăŒå®Œäº†ă—ă¾ă—ăŸ" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"ă„ăă¤ă‹ă®ă‚¢ăƒ¼ă‚«ă‚¤ăƒ–ă‚’å–å¾—ă§ăă¾ă›ă‚“。apt-get update ă‚’å®Ÿè¡Œă™ă‚‹ă‹ --fix-" -"missing ă‚ªăƒ—ă‚·ăƒ§ăƒ³ă‚’ä»˜ă‘ă¦è©¦ă—ă¦ă¿ă¦ăă ă•ă„。" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ă¨ăƒ¡ăƒ‡ă‚£ă‚¢äº¤æ›ă¯ç¾åœ¨åŒæ™‚ă«ă¯ă‚µăƒăƒ¼ăƒˆă•ă‚Œă¦ă„ă¾ă›ă‚“" @@ -2067,20 +2067,6 @@ msgid_plural "Use '%s' to remove them." msgstr[0] "ă“ă‚Œă‚’å‰é™¤ă™ă‚‹ă«ă¯ '%s' ă‚’åˆ©ç”¨ă—ă¦ăă ă•ă„。" #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "" -"以下ă®å•é¡Œă‚’解決ă™ă‚‹ăŸă‚ă« 'apt-get -f install' ă‚’å®Ÿè¡Œă™ă‚‹å¿…è¦ăŒă‚ă‚‹ă‹ă‚‚ă—ă‚Œ" -"ă¾ă›ă‚“:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"未解決ă®ä¾å˜é–¢ä¿‚ă§ă™ă€‚'apt-get -f install' ă‚’å®Ÿè¡Œă—ă¦ă¿ă¦ăă ă•ă„ (ă¾ăŸă¯è§£æ³•" -"ă‚’æ˜ç¤ºă—ă¦ăă ă•ă„)。" - -#: apt-private/private-install.cc msgid "The following additional packages will be installed:" msgstr "以下ă®è¿½å ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ăŒă‚¤ăƒ³ă‚¹ăƒˆăƒ¼ăƒ«ă•ă‚Œă¾ă™:" @@ -2471,7 +2457,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "å±•é–‹ă‚³ăƒăƒ³ăƒ‰ '%s' ăŒå¤±æ•—ă—ă¾ă—ăŸă€‚\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ăŒă‚¤ăƒ³ă‚¹ăƒˆăƒ¼ăƒ«ă•ă‚Œă¦ă„ă‚‹ă“ă¨ă‚’確èªă—ă¦ăă ă•ă„。\n" @@ -2753,6 +2738,10 @@ msgid "" "apt-dump-solver is an interface to store an EDSP scenario in\n" "a file and optionally forwards it to another solver.\n" msgstr "" +"使用方法: apt-dump-solver\n" +"\n" +"apt-dump-solver ă¯ EDSP ă‚·ăƒăƒªă‚ªă‚’ăƒ•ă‚¡ă‚¤ăƒ«ă«æ®‹ă—ă€\n" +"ă‚ªăƒ—ă‚·ăƒ§ăƒ³ă§åˆ¥ă®ă‚½ăƒ«ăƒă«è»¢é€ă™ă‚‹ă‚¤ăƒ³ă‚¿ăƒ¼ăƒ•ă‚§ă‚¤ă‚¹ă§ă™ă€‚\n" #: cmdline/apt-extracttemplates.cc msgid "" @@ -2931,7 +2920,6 @@ msgid "detect proxy using apt.conf" msgstr "apt.conf ă‚’ä½¿ă£ă¦ăƒ—ăƒă‚ă‚·ă‚’æ¤œå‡ºă™ă‚‹" #: cmdline/apt-internal-planner.cc -#, fuzzy msgid "" "Usage: apt-internal-planner\n" "\n" @@ -2941,8 +2929,8 @@ msgid "" msgstr "" "使用方法: apt-internal-solver\n" "\n" -"apt-internal-solver ă¯ă€ăƒ‡ăƒăƒƒă‚°ăªă©ă®ç”¨é€”ă§ă€ç¾åœ¨ă®å†…éƒ¨ăƒªă‚¾ăƒ«ăƒă‚’\n" -"APT ăƒ•ă‚¡ăƒŸăƒªă®å¤–éƒ¨ăƒªă‚¾ăƒ«ăƒă®ă‚ˆă†ă«ä½¿ă†ăŸă‚ă®ă‚¤ăƒ³ă‚¿ăƒ¼ăƒ•ă‚§ă‚¤ă‚¹ă§ă™ă€‚\n" +"apt-internal-planner ă¯ă€ăƒ‡ăƒăƒƒă‚°ăªă©ă®ç”¨é€”ă§ă€ç¾åœ¨ă®å†…éƒ¨ăƒ—ăƒ©ăƒ³ăƒăƒ¼ă‚’\n" +"APT ăƒ•ă‚¡ăƒŸăƒªă®å¤–éƒ¨ăƒ—ăƒ©ăƒ³ăƒăƒ¼ă®ă‚ˆă†ă«ä½¿ă†ăŸă‚ă®ă‚¤ăƒ³ă‚¿ăƒ¼ăƒ•ă‚§ă‚¤ă‚¹ă§ă™ă€‚\n" #: cmdline/apt-internal-solver.cc msgid "" @@ -3456,6 +3444,55 @@ msgstr " %s ă«ă‚½ăƒ¼ă‚¹ override ă‚¨ăƒ³ăƒˆăƒªăŒă‚ă‚ă¾ă›ă‚“\n" msgid " %s has no binary override entry either\n" msgstr " %s ă«ăƒă‚¤ăƒăƒª override ă‚¨ăƒ³ăƒˆăƒªăŒă‚ă‚ă¾ă›ă‚“\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "ăƒ˜ăƒƒăƒ€ă®å¾…æ©Ÿä¸ă§ă™" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP ă‚µăƒ¼ăƒăŒä¸æ£ăªăƒªăƒ—ăƒ©ă‚¤ăƒ˜ăƒƒăƒ€ă‚’é€ä¿¡ă—ă¦ăă¾ă—ăŸ" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "ä¸æ£ăªăƒ˜ăƒƒăƒ€è¡Œă§ă™" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP ă‚µăƒ¼ăƒăŒä¸æ£ăª Content-Length ăƒ˜ăƒƒăƒ€ă‚’é€ä¿¡ă—ă¦ăă¾ă—ăŸ" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP ă‚µăƒ¼ăƒăŒä¸æ£ăª Content-Range ăƒ˜ăƒƒăƒ€ă‚’é€ä¿¡ă—ă¦ăă¾ă—ăŸ" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "HTTP ă‚µăƒ¼ăƒă®ăƒ¬ăƒ³ă‚¸ă‚µăƒăƒ¼ăƒˆăŒå£ă‚Œă¦ă„ă¾ă™" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "ä¸æ˜ăªæ—¥ä»˜ăƒ•ă‚©ăƒ¼ăƒăƒƒăƒˆă§ă™" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "ä¸æ£ăªăƒ˜ăƒƒăƒ€ă§ă™" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "æ¥ç¶å¤±æ•—" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" +"ă‚µăƒ¼ăƒ/ăƒ—ăƒă‚ă‚·ă‹ă‚‰ă®ä¸æ£ăªå¿œç”ă®ăŸă‚自動ç„ă« %s ă‚’ç„¡å¹ă«ă—ă¾ă—ăŸă€‚(man 5 " +"apt.conf)" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "å†…éƒ¨ă‚¨ăƒ©ăƒ¼" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3490,7 +3527,7 @@ msgstr "ăƒ•ă‚¡ă‚¤ăƒ«ăŒè¦‹ă¤ă‹ă‚ă¾ă›ă‚“" #: methods/connect.cc #, c-format msgid "Direct connection to %s domains is blocked by default." -msgstr "" +msgstr "%s ăƒ‰ăƒ¡ă‚¤ăƒ³ă¸ă®ç›´æ¥ă®æ¥ç¶ă¯ăƒ‡ăƒ•ă‚©ăƒ«ăƒˆă§ăƒ–ăƒăƒƒă‚¯ă•ă‚Œă¦ă„ă¾ă™ă€‚" #: methods/connect.cc methods/http.cc #, c-format @@ -3707,12 +3744,11 @@ msgstr "呼ă³å‡ºă›ă¾ă›ă‚“" #. TRANSLATORS: %s is a single techy word like 'NODATA' #: methods/gpgv.cc -#, fuzzy, c-format +#, c-format msgid "" "Signed file isn't valid, got '%s' (does the network require authentication?)" msgstr "" -"ă‚¯ăƒªă‚¢ă‚µă‚¤ăƒ³ă•ă‚ŒăŸăƒ•ă‚¡ă‚¤ăƒ«ăŒæœ‰å¹ă§ă¯ăªăă€'%s' ă‚’å¾—ă¾ă—ăŸ (èªè¨¼ă«ăƒăƒƒăƒˆăƒ¯ăƒ¼ă‚¯" -"ăŒå¿…è¦?)" +"ç½²åă•ă‚ŒăŸăƒ•ă‚¡ă‚¤ăƒ«ăŒæœ‰å¹ă§ă¯ăªăă€'%s' ă‚’å¾—ă¾ă—ăŸ (ăƒăƒƒăƒˆăƒ¯ăƒ¼ă‚¯ă«èªè¨¼ăŒå¿…è¦?)" #: methods/gpgv.cc msgid "At least one invalid signature was encountered." @@ -3809,344 +3845,6 @@ msgstr "変更時刻ă®è¨å®ă«å¤±æ•—ă—ă¾ă—ăŸ" msgid "Connection closed prematurely" msgstr "途ä¸ă§æ¥ç¶ăŒă‚¯ăƒăƒ¼ă‚ºă•ă‚Œă¾ă—ăŸ" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "ăƒ˜ăƒƒăƒ€ă®å¾…æ©Ÿä¸ă§ă™" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "HTTP ă‚µăƒ¼ăƒăŒä¸æ£ăªăƒªăƒ—ăƒ©ă‚¤ăƒ˜ăƒƒăƒ€ă‚’é€ä¿¡ă—ă¦ăă¾ă—ăŸ" - -#: methods/server.cc -msgid "Bad header line" -msgstr "ä¸æ£ăªăƒ˜ăƒƒăƒ€è¡Œă§ă™" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "HTTP ă‚µăƒ¼ăƒăŒä¸æ£ăª Content-Length ăƒ˜ăƒƒăƒ€ă‚’é€ä¿¡ă—ă¦ăă¾ă—ăŸ" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "HTTP ă‚µăƒ¼ăƒăŒä¸æ£ăª Content-Range ăƒ˜ăƒƒăƒ€ă‚’é€ä¿¡ă—ă¦ăă¾ă—ăŸ" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "HTTP ă‚µăƒ¼ăƒă®ăƒ¬ăƒ³ă‚¸ă‚µăƒăƒ¼ăƒˆăŒå£ă‚Œă¦ă„ă¾ă™" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "ä¸æ˜ăªæ—¥ä»˜ăƒ•ă‚©ăƒ¼ăƒăƒƒăƒˆă§ă™" - -#: methods/server.cc -msgid "Bad header data" -msgstr "ä¸æ£ăªăƒ˜ăƒƒăƒ€ă§ă™" - -#: methods/server.cc -msgid "Connection failed" -msgstr "æ¥ç¶å¤±æ•—" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" -"ă‚µăƒ¼ăƒ/ăƒ—ăƒă‚ă‚·ă‹ă‚‰ă®ä¸æ£ăªå¿œç”ă®ăŸă‚自動ç„ă« %s ă‚’ç„¡å¹ă«ă—ă¾ă—ăŸă€‚(man 5 " -"apt.conf)" - -#: methods/server.cc -msgid "Internal error" -msgstr "å†…éƒ¨ă‚¨ăƒ©ăƒ¼" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "空ă®ăƒ•ă‚¡ă‚¤ăƒ«ă¯æœ‰å¹ăªă‚¢ăƒ¼ă‚«ă‚¤ăƒ–ă¨èªă‚ă‚‰ă‚Œă¾ă›ă‚“" - -#~ msgid "Failed to fetch %s %s\n" -#~ msgstr "%s ă®å–å¾—ă«å¤±æ•—ă—ă¾ă—ăŸ %s\n" - -#~ msgid "(not found)" -#~ msgstr "(見ă¤ă‹ă‚ă¾ă›ă‚“)" - -#~ msgid " Package pin: " -#~ msgstr " ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ Pin: " - -#~ msgid "Invalid 'Valid-Until' entry in Release file %s" -#~ msgstr "Release ăƒ•ă‚¡ă‚¤ăƒ« %s ă«ç„¡å¹ăª 'Valid-Until' ă‚¨ăƒ³ăƒˆăƒªăŒă‚ă‚ă¾ă™" - -#~ msgid "There is no public key available for the following key IDs:\n" -#~ msgstr "以下ă®éµ ID ă«å¯¾ă—ă¦åˆ©ç”¨å¯èƒ½ăªå…¬é–‹éµăŒă‚ă‚ă¾ă›ă‚“:\n" - -#, fuzzy -#~ msgid "The repository is insufficiently signed by key %s (%s)" -#~ msgstr "ăƒ‡ă‚£ăƒ¬ă‚¯ăƒˆăƒª %s ă¯ divert ă•ă‚Œă¦ă„ă¾ă™" - -#~ msgid "" -#~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " -#~ "packages" -#~ msgstr "" -#~ "ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ %3$s ăŒ '%4$s' ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ă§è¨±ă•ă‚Œă¦ă„ăªă„ăŸă‚ă€%2$s ă«å¯¾ă™ă‚‹ " -#~ "%1$s ă®ä¾å˜é–¢ä¿‚ă‚’æº€ăŸă™ă“ă¨ăŒă§ăă¾ă›ă‚“" - -#~ msgid "" -#~ "%s dependency for %s cannot be satisfied because the package %s cannot be " -#~ "found" -#~ msgstr "" -#~ "ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ %3$s ăŒè¦‹ă¤ă‹ă‚‰ăªă„ăŸă‚ă€%2$s ă«å¯¾ă™ă‚‹ %1$s ă®ä¾å˜é–¢ä¿‚ă‚’æº€ăŸă™" -#~ "ă“ă¨ăŒă§ăă¾ă›ă‚“" - -#~ msgid "" -#~ "Failed to satisfy %s dependency for %s: Installed package %s is too new" -#~ msgstr "" -#~ "%2$s ă®ä¾å˜é–¢ä¿‚ %1$s ă‚’æº€ăŸă™ă“ă¨ăŒă§ăă¾ă›ă‚“: ă‚¤ăƒ³ă‚¹ăƒˆăƒ¼ăƒ«ă•ă‚ŒăŸ %3$s " -#~ "ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ă¯æ–°ă—ă™ăă¾ă™" - -#~ msgid "" -#~ "%s dependency for %s cannot be satisfied because candidate version of " -#~ "package %s can't satisfy version requirements" -#~ msgstr "" -#~ "ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ %3$s ă®å€™è£œăƒăƒ¼ă‚¸ăƒ§ăƒ³ă¯ăƒăƒ¼ă‚¸ăƒ§ăƒ³ă«ă¤ă„ă¦ă®è¦æ±‚ă‚’æº€ăŸă›ăªă„ăŸ" -#~ "ă‚ă€%2$s ă«å¯¾ă™ă‚‹ %1$s ă®ä¾å˜é–¢ä¿‚ă‚’æº€ăŸă™ă“ă¨ăŒă§ăă¾ă›ă‚“" - -#~ msgid "" -#~ "%s dependency for %s cannot be satisfied because package %s has no " -#~ "candidate version" -#~ msgstr "" -#~ "ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ %3$s ă®å€™è£œăƒăƒ¼ă‚¸ăƒ§ăƒ³ăŒå˜åœ¨ă—ăªă„ăŸă‚ă€%2$s ă«å¯¾ă™ă‚‹ %1$s ă®ä¾" -#~ "å˜é–¢ä¿‚ă‚’æº€ăŸă™ă“ă¨ăŒă§ăă¾ă›ă‚“" - -#~ msgid "Failed to satisfy %s dependency for %s: %s" -#~ msgstr "%2$s ă®ä¾å˜é–¢ä¿‚ %1$s ă‚’æº€ăŸă™ă“ă¨ăŒă§ăă¾ă›ă‚“: %3$s" - -#~ msgid "Build-dependencies for %s could not be satisfied." -#~ msgstr "%s ă®ăƒ“ăƒ«ăƒ‰ä¾å˜é–¢ä¿‚ă‚’æº€ăŸă™ă“ă¨ăŒă§ăă¾ă›ă‚“ă§ă—ăŸă€‚" - -#~ msgid "Problem unlinking %s" -#~ msgstr "%s ă®ăƒªăƒ³ă‚¯è§£é™¤ă§å•é¡ŒăŒç™ºç”Ÿă—ă¾ă—ăŸ" - -#~ msgid "Failed to unlink %s" -#~ msgstr "%s ă®ăƒªăƒ³ă‚¯è§£é™¤ă«å¤±æ•—ă—ă¾ă—ăŸ" - -#~ msgid "" -#~ "Usage: apt-cache [options] command\n" -#~ " apt-cache [options] show pkg1 [pkg2 ...]\n" -#~ "\n" -#~ "apt-cache is a low-level tool used to query information\n" -#~ "from APT's binary cache files\n" -#~ msgstr "" -#~ "使用方法: apt-cache [ă‚ªăƒ—ă‚·ăƒ§ăƒ³] ă‚³ăƒăƒ³ăƒ‰\n" -#~ " apt-cache [ă‚ªăƒ—ă‚·ăƒ§ăƒ³] show pkg1 [pkg2 ...]\n" -#~ "\n" -#~ "apt-cache ă¯ APT ă®ăƒă‚¤ăƒăƒªă‚ăƒ£ăƒƒă‚·ăƒ¥ăƒ•ă‚¡ă‚¤ăƒ«ă‚’æ“作ă—ăŸă‚ă€ăă“ă‹ă‚‰æƒ…\n" -#~ "å ±ă‚’æ¤œç´¢ă—ăŸă‚ă™ă‚‹ăŸă‚ă®ä½ăƒ¬ăƒ™ăƒ«ă®ăƒ„ăƒ¼ăƒ«ă§ă™\n" - -#~ msgid "Commands:" -#~ msgstr "ă‚³ăƒăƒ³ăƒ‰:" - -#~ msgid "" -#~ "Options:\n" -#~ " -h This help text.\n" -#~ " -p=? The package cache.\n" -#~ " -s=? The source cache.\n" -#~ " -q Disable progress indicator.\n" -#~ " -i Show only important deps for the unmet command.\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" -#~ msgstr "" -#~ "ă‚ªăƒ—ă‚·ăƒ§ăƒ³:\n" -#~ " -h ă“ă®ăƒ˜ăƒ«ăƒ—ă‚’è¡¨ç¤ºă™ă‚‹\n" -#~ " -p=? ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ă‚ăƒ£ăƒƒă‚·ăƒ¥\n" -#~ " -s=? ă‚½ăƒ¼ă‚¹ă‚ăƒ£ăƒƒă‚·ăƒ¥\n" -#~ " -q ăƒ—ăƒă‚°ăƒ¬ă‚¹è¡¨ç¤ºă‚’ă—ăªă„\n" -#~ " -i umnet ă‚³ăƒăƒ³ăƒ‰ă§é‡è¦ăªä¾å˜æƒ…å ±ă®ă¿ă‚’表示ă™ă‚‹\n" -#~ " -c=? 指å®ă—ăŸè¨å®ăƒ•ă‚¡ă‚¤ăƒ«ă‚’èªă¿è¾¼ă‚€\n" -#~ " -o=? 指å®ă—ăŸè¨å®ă‚ªăƒ—ă‚·ăƒ§ăƒ³ă‚’èªă¿è¾¼ă‚€ (例: -o dir::cache=/tmp)\n" -#~ "詳細ă¯ă€apt-cache(8) ă‚„ apt.conf(5) ă®ăƒăƒ‹ăƒ¥ă‚¢ăƒ«ăƒăƒ¼ă‚¸ă‚’å‚ç…§ă—ă¦ăă ă•" -#~ "ă„。\n" - -#~ msgid "" -#~ "Usage: apt [options] command\n" -#~ "\n" -#~ "CLI for apt.\n" -#~ msgstr "" -#~ "使用法: apt [ă‚ªăƒ—ă‚·ăƒ§ăƒ³] ă‚³ăƒăƒ³ăƒ‰\n" -#~ "\n" -#~ "apt ç”¨ă‚³ăƒăƒ³ăƒ‰ăƒ©ă‚¤ăƒ³ă‚¤ăƒ³ă‚¿ăƒ¼ăƒ•ă‚§ă‚¤ă‚¹\n" - -#, fuzzy -#~ msgid "" -#~ "Options:\n" -#~ " -h This help text\n" -#~ " -d CD-ROM mount point\n" -#~ " -r Rename a recognized CD-ROM\n" -#~ " -m No mounting\n" -#~ " -f Fast mode, don't check package files\n" -#~ " -a Thorough scan mode\n" -#~ " --no-auto-detect Do not try to auto detect drive and mount point\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ "See fstab(5)\n" -#~ msgstr "" -#~ "ă‚ªăƒ—ă‚·ăƒ§ăƒ³:\n" -#~ " -h ă“ă®ăƒ˜ăƒ«ăƒ—ă‚’è¡¨ç¤ºă™ă‚‹\n" -#~ " -q ăƒă‚°ăƒ•ă‚¡ă‚¤ăƒ«ă«å‡ºå›å¯èƒ½ăªå½¢å¼ă«ă™ă‚‹ - ăƒ—ăƒă‚°ăƒ¬ă‚¹è¡¨ç¤ºă‚’ă—ăªă„\n" -#~ " -qq ă‚¨ăƒ©ăƒ¼ä»¥å¤–ă¯è¡¨ç¤ºă—ăªă„\n" -#~ " -s 実é›ă«ă¯å®Ÿè¡Œă—ăªă„ă€‚å®Ÿè¡Œă‚·ăƒŸăƒ¥ăƒ¬ăƒ¼ă‚·ăƒ§ăƒ³ă®ă¿è¡Œă†\n" -#~ " -f 指å®ă®ăƒ•ă‚¡ă‚¤ăƒ«ă‚’使ă£ă¦è‡ªå‹•/手動ă®ăƒăƒ¼ă‚ăƒ³ă‚°ă‚’èªă¿æ›¸ăă™ă‚‹\n" -#~ " -c=? 指å®ă—ăŸè¨å®ăƒ•ă‚¡ă‚¤ăƒ«ă‚’èªă¿è¾¼ă‚€\n" -#~ " -o=? ä»»æ„ă®è¨å®ă‚ªăƒ—ă‚·ăƒ§ăƒ³ă‚’æŒ‡å®ă™ă‚‹ (例 -o dir::cache=/tmp)\n" -#~ "ă•ă‚‰ăªă‚‹æƒ…å ±ă«ă¤ă„ă¦ă¯ă€ăƒăƒ‹ăƒ¥ă‚¢ăƒ«ăƒăƒ¼ă‚¸ apt-mark(8) ăă‚ˆă³ apt.conf(5) ă‚’" -#~ "å‚ç…§ă—ă¦ăă ă•ă„。" - -#~ msgid "" -#~ "Options:\n" -#~ " -h This help text.\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ msgstr "" -#~ "ă‚ªăƒ—ă‚·ăƒ§ăƒ³:\n" -#~ " -h ă“ă®ăƒ˜ăƒ«ăƒ—ă‚’è¡¨ç¤ºă™ă‚‹\n" -#~ " -c=? 指å®ă—ăŸè¨å®ăƒ•ă‚¡ă‚¤ăƒ«ă‚’èªă¿è¾¼ă‚€\n" -#~ " -o=? 指å®ă—ăŸè¨å®ă‚ªăƒ—ă‚·ăƒ§ăƒ³ă‚’é©ç”¨ă™ă‚‹ (例: -o dir::cache=/tmp)\n" - -#~ msgid "" -#~ "Options:\n" -#~ " -h This help text.\n" -#~ " -q Loggable output - no progress indicator\n" -#~ " -qq No output except for errors\n" -#~ " -s No-act. Just prints what would be done.\n" -#~ " -f read/write auto/manual marking in the given file\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." -#~ msgstr "" -#~ "ă‚ªăƒ—ă‚·ăƒ§ăƒ³:\n" -#~ " -h ă“ă®ăƒ˜ăƒ«ăƒ—ă‚’è¡¨ç¤ºă™ă‚‹\n" -#~ " -q ăƒă‚°ăƒ•ă‚¡ă‚¤ăƒ«ă«å‡ºå›å¯èƒ½ăªå½¢å¼ă«ă™ă‚‹ - ăƒ—ăƒă‚°ăƒ¬ă‚¹è¡¨ç¤ºă‚’ă—ăªă„\n" -#~ " -qq ă‚¨ăƒ©ăƒ¼ä»¥å¤–ă¯è¡¨ç¤ºă—ăªă„\n" -#~ " -s 実é›ă«ă¯å®Ÿè¡Œă—ăªă„ă€‚å®Ÿè¡Œă‚·ăƒŸăƒ¥ăƒ¬ăƒ¼ă‚·ăƒ§ăƒ³ă®ă¿è¡Œă†\n" -#~ " -f 指å®ă®ăƒ•ă‚¡ă‚¤ăƒ«ă‚’使ă£ă¦è‡ªå‹•/手動ă®ăƒăƒ¼ă‚ăƒ³ă‚°ă‚’èªă¿æ›¸ăă™ă‚‹\n" -#~ " -c=? 指å®ă—ăŸè¨å®ăƒ•ă‚¡ă‚¤ăƒ«ă‚’èªă¿è¾¼ă‚€\n" -#~ " -o=? ä»»æ„ă®è¨å®ă‚ªăƒ—ă‚·ăƒ§ăƒ³ă‚’æŒ‡å®ă™ă‚‹ (例 -o dir::cache=/tmp)\n" -#~ "ă•ă‚‰ăªă‚‹æƒ…å ±ă«ă¤ă„ă¦ă¯ă€ăƒăƒ‹ăƒ¥ă‚¢ăƒ«ăƒăƒ¼ă‚¸ apt-mark(8) ăă‚ˆă³ apt.conf(5) ă‚’" -#~ "å‚ç…§ă—ă¦ăă ă•ă„。" - -#~ msgid "" -#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -#~ "\n" -#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is " -#~ "used\n" -#~ "to indicate what kind of file it is.\n" -#~ "\n" -#~ "Options:\n" -#~ " -h This help text\n" -#~ " -s Use source file sorting\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ msgstr "" -#~ "使用方法: apt-sortpkgs [ă‚ªăƒ—ă‚·ăƒ§ăƒ³] ăƒ•ă‚¡ă‚¤ăƒ«å1 [ăƒ•ă‚¡ă‚¤ăƒ«å2 ...]\n" -#~ "\n" -#~ "apt-sortpkgs ă¯ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ăƒ•ă‚¡ă‚¤ăƒ«ă‚’ă‚½ăƒ¼ăƒˆă™ă‚‹ăŸă‚ă®ç°¡å˜ăªăƒ„ăƒ¼ăƒ«ă§ă™ă€‚\n" -#~ "-s ă‚ªăƒ—ă‚·ăƒ§ăƒ³ă¯ăƒ•ă‚¡ă‚¤ăƒ«ă®ç¨®é¡ă‚’示ă™ăŸă‚ă«ä½¿ç”¨ă•ă‚Œă¾ă™ă€‚\n" -#~ "\n" -#~ "ă‚ªăƒ—ă‚·ăƒ§ăƒ³:\n" -#~ " -h ă“ă®ăƒ˜ăƒ«ăƒ—ă‚’è¡¨ç¤ºă™ă‚‹\n" -#~ " -s ă‚½ăƒ¼ă‚¹ăƒ•ă‚¡ă‚¤ăƒ«ă‚½ăƒ¼ăƒˆă‚’ä½¿ç”¨ă™ă‚‹\n" -#~ " -c=? 指å®ă—ăŸè¨å®ăƒ•ă‚¡ă‚¤ăƒ«ă‚’èªă¿è¾¼ă‚€\n" -#~ " -o=? 指å®ă—ăŸè¨å®ă‚ªăƒ—ă‚·ăƒ§ăƒ³ă‚’é©ç”¨ă™ă‚‹ (例: -o dir::cache=/tmp)\n" - -#~ msgid "Child process failed" -#~ msgstr "åăƒ—ăƒă‚»ă‚¹ăŒå¤±æ•—ă—ă¾ă—ăŸ" - -#, fuzzy -#~ msgid "Must specifc at least one srv record" -#~ msgstr "å°‘ăªăă¨ă‚‚ URL / ăƒ•ă‚¡ă‚¤ăƒ«åă‚’ 1 組指å®ă™ă‚‹å¿…è¦ăŒă‚ă‚ă¾ă™" - -#~ msgid "Failed to create pipes" -#~ msgstr "ăƒ‘ă‚¤ăƒ—ă®ç”Ÿæˆă«å¤±æ•—ă—ă¾ă—ăŸ" - -#~ msgid "Failed to exec gzip " -#~ msgstr "gzip ă®å®Ÿè¡Œă«å¤±æ•—ă—ă¾ă—ăŸ" - -#~ msgid "%s %s for %s compiled on %s %s\n" -#~ msgstr "%s %s for %s ă‚³ăƒ³ăƒ‘ă‚¤ăƒ«æ—¥æ™‚: %s %s\n" - -#~ msgid "Failed to create FILE*" -#~ msgstr "FILE* ă®ä½œæˆă«å¤±æ•—ă—ă¾ă—ăŸ" - -#~ msgid "Malformed stanza %u in source list %s (URI parse)" -#~ msgstr "ă‚½ăƒ¼ă‚¹ăƒªă‚¹ăƒˆ %2$s ă® %1$u 個目ă®åŒºåˆ‡ă‚ăŒä¸æ£ă§ă™ (URI parse)" - -#~ msgid "Malformed line %lu in source list %s ([option] unparseable)" -#~ msgstr "" -#~ "ă‚½ăƒ¼ă‚¹ăƒªă‚¹ăƒˆ %2$s ă® %1$lu 行目ăŒä¸æ£ă§ă™ ([ă‚ªăƒ—ă‚·ăƒ§ăƒ³] ă‚’è§£é‡ˆă§ăă¾ă›ă‚“)" - -#~ msgid "Malformed line %lu in source list %s ([option] too short)" -#~ msgstr "" -#~ "ă‚½ăƒ¼ă‚¹ăƒªă‚¹ăƒˆ %2$s ă® %1$lu 行目ăŒä¸æ£ă§ă™ ([ă‚ªăƒ—ă‚·ăƒ§ăƒ³] ăŒçŸă‹ă™ăă¾ă™)" - -#~ msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -#~ msgstr "" -#~ "ă‚½ăƒ¼ă‚¹ăƒªă‚¹ăƒˆ %2$s ă® %1$lu 行目ăŒä¸æ£ă§ă™ ([%3$s] ă¯å‰²ă‚当ă¦ă‚‰ă‚Œă¦ă„ă¾ă›" -#~ "ă‚“)" - -#~ msgid "Malformed line %lu in source list %s ([%s] has no key)" -#~ msgstr "" -#~ "ă‚½ăƒ¼ă‚¹ăƒªă‚¹ăƒˆ %2$s ă® %1$lu 行目ăŒä¸æ£ă§ă™ ([%3$s ă«ă‚ăƒ¼ăŒă‚ă‚ă¾ă›ă‚“)" - -#~ msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" -#~ msgstr "" -#~ "ă‚½ăƒ¼ă‚¹ăƒªă‚¹ăƒˆ %2$s ă® %1$lu 行目ăŒä¸æ£ă§ă™ ([%3$s] ă‚ăƒ¼ %4$s ă«å€¤ăŒă‚ă‚ă¾ă›" -#~ "ă‚“)" - -#~ msgid "Malformed line %lu in source list %s (URI)" -#~ msgstr "ă‚½ăƒ¼ă‚¹ăƒªă‚¹ăƒˆ %2$s ă® %1$lu 行目ăŒä¸æ£ă§ă™ (URI)" - -#~ msgid "Malformed line %lu in source list %s (dist)" -#~ msgstr "ă‚½ăƒ¼ă‚¹ăƒªă‚¹ăƒˆ %2$s ă® %1$lu 行目ăŒä¸æ£ă§ă™ (dist)" - -#~ msgid "Malformed line %lu in source list %s (URI parse)" -#~ msgstr "ă‚½ăƒ¼ă‚¹ăƒªă‚¹ăƒˆ %2$s ă® %1$lu 行目ăŒä¸æ£ă§ă™ (URI parse)" - -#~ msgid "Malformed line %lu in source list %s (absolute dist)" -#~ msgstr "ă‚½ăƒ¼ă‚¹ăƒªă‚¹ăƒˆ %2$s ă® %1$lu 行目ăŒä¸æ£ă§ă™ (absolute dist)" - -#~ msgid "Malformed line %lu in source list %s (dist parse)" -#~ msgstr "ă‚½ăƒ¼ă‚¹ăƒªă‚¹ăƒˆ %2$s ă® %1$lu 行目ăŒä¸æ£ă§ă™ (dist parse)" - -#~ msgid "Package %s %s was not found while processing file dependencies" -#~ msgstr "ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ %s %s ăŒăƒ•ă‚¡ă‚¤ăƒ«ä¾å˜ă®å‡¦ç†ä¸ă«è¦‹ă¤ă‹ă‚ă¾ă›ă‚“ă§ă—ăŸ" - -#~ msgid "Couldn't stat source package list %s" -#~ msgstr "ă‚½ăƒ¼ă‚¹ăƒ‘ăƒƒă‚±ăƒ¼ă‚¸ăƒªă‚¹ăƒˆ %s ă®ç¶æ…‹ă‚’å–å¾—ă§ăă¾ă›ă‚“" - -#~ msgid "Collecting File Provides" -#~ msgstr "ăƒ•ă‚¡ă‚¤ăƒ«æä¾›æƒ…å ±ă‚’å集ă—ă¦ă„ă¾ă™" - -#~ msgid "Unable to find hash sum for '%s' in Release file" -#~ msgstr "Release ăƒ•ă‚¡ă‚¤ăƒ«ä¸ă® '%s' ă®ăƒăƒƒă‚·ăƒ¥ă‚µăƒ ă‚’è¦‹ă¤ă‘ă‚‰ă‚Œă¾ă›ă‚“" - -#~ msgid "Vendor block %s contains no fingerprint" -#~ msgstr "ăƒ™ăƒ³ăƒ€ăƒ–ăƒăƒƒă‚¯ %s ă¯éµæŒ‡ç´‹ă‚’å«ă‚“ă§ă„ă¾ă›ă‚“" - -#~ msgid "Total dependency version space: " -#~ msgstr "ç·ä¾å˜é–¢ä¿‚ăƒ»ăƒăƒ¼ă‚¸ăƒ§ăƒ³å®¹é‡: " - -#~ msgid "You don't have enough free space in %s" -#~ msgstr "%s ă«å……分ăªç©ºăă‚¹ăƒăƒ¼ă‚¹ăŒă‚ă‚ă¾ă›ă‚“" - -#~ msgid "Done" -#~ msgstr "完了" - -#~ msgid "No keyring installed in %s." -#~ msgstr "%s ă«ă‚ăƒ¼ăƒªăƒ³ă‚°ăŒă‚¤ăƒ³ă‚¹ăƒˆăƒ¼ăƒ«ă•ă‚Œă¦ă„ă¾ă›ă‚“。" - -#~ msgid "Is stdout a terminal?" -#~ msgstr "標準出å›ă¯ă‚¿ăƒ¼ăƒŸăƒăƒ«ă§ă™ă‹?" - -#~ msgid "ioctl(TIOCGWINSZ) failed" -#~ msgstr "ioctl(TIOCGWINSZ) ă«å¤±æ•—ă—ă¾ă—ăŸ" - -#~ msgid "Internal error, Upgrade broke stuff" -#~ msgstr "å†…éƒ¨ă‚¨ăƒ©ăƒ¼ă€ă‚¢ăƒƒăƒ—ă‚°ăƒ¬ăƒ¼ăƒ‰ă§ä½•ă‹å£ă‚Œă¾ă—ăŸ" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -410,8 +410,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1605,13 +1605,17 @@ msgstr "á˜á·á“á¢á¶á…​á”á„្áá½á˜â€‹á€á¶á​á€áŸ†áá់​ msgid " Done" msgstr " á’្áœá¾â€‹áá½á…" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "á¢áŸ’á“á€â€‹á”្áá ែá›â€‹á‡á¶â€‹á…á„់áá់ 'apt-get -f install' áá¾á˜áŸ’á”á¸â€‹á€áŸ‚​áœá¶â€‹â€‹á‘á¶áŸ†á„á“áŸáŸ‡â€‹á á¾á™Â ។" +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "á¢áŸ’á“á€â€‹á”្áá ែá›â€‹á‡á¶â€‹á…á„់áá់ 'apt --fix-broken install' áá¾á˜áŸ’á”á¸â€‹á€áŸ‚​áœá¶â€‹â€‹á‘á¶áŸ†á„á“áŸáŸ‡â€‹á á¾á™Â ។" -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "á—á¶á–​á¢á¶áŸáŸ’ááŸá™â€‹áែá›â€‹áá»áŸâ€‹á‚្á“á¶Â ។ á–្á™á¶á™á¶á˜â€‹á€á¶á​á”្áá¾ -f ។" +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"á—á¶á–á¢áŸáŸ’ááŸá™â€‹áែá›â€‹áá»áŸâ€‹á‚្á“á¶Â ។ á–្á™á¶á™á¶á˜â€‹ 'apt --fix-broken install' áោá™â€‹á‚្á˜á¶á“​á€á‰áŸ’á…á”់ (ᬠá”á‰áŸ’á‡á¶á€áŸ‹â€‹" +"áំáោះáŸáŸ’áá¶á™) ។" #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1797,6 +1801,14 @@ msgid "Broken packages" msgstr "á€á‰áŸ’á…á”់​áែá›â€‹á”á¶á“​áá¼á…​" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"á¢á“á»á‰áŸ’á‰á¶á​á²áŸ’á™â€‹á‘ៅ​á”្áá˜á¼á›â€‹á™á€â€‹á”áŸá្ááŸá¶á​á˜á½á™â€‹á…ំá“á½á“​ á”្áá ែá›â€‹á‡á¶â€‹áá់​á—á¶á–​á‘á¶á“់​áŸá˜áŸá™ apt-get ᬠá–្á™á¶á™á¶á˜á”្áá¾â€‹á‡á¶á˜á½á™ --" +"fix- áែá›á”á¶á់á¬áŸ‹Â ?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "á€áŸ†á á»áŸâ€‹áá¶á„á€áŸ’á“á»á„ á€á‰áŸ’á…á”់​áំá¡á¾á„​á្áá¼áœâ€‹á”á¶á“​á ៅ​​á‡á¶á˜á½á™â€‹á€á‰áŸ’á…á”់​áែá›â€‹áá¼á… !" @@ -1897,14 +1909,6 @@ msgid "Download complete and in download only mode" msgstr "á”á¶á“á”á‰áŸ’á…á”់á€á¶áá‘á¶á‰â€‹á™á€â€‹ á á¾á™â€‹áែ​á€áŸ’á“á»á„​áá”ៀá”​​á‘á¶á‰â€‹á™á€â€‹á”៉á»á្áោះ" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"á¢á“á»á‰áŸ’á‰á¶á​á²áŸ’á™â€‹á‘ៅ​á”្áá˜á¼á›â€‹á™á€â€‹á”áŸá្ááŸá¶á​á˜á½á™â€‹á…ំá“á½á“​ á”្áá ែá›â€‹á‡á¶â€‹áá់​á—á¶á–​á‘á¶á“់​áŸá˜áŸá™ apt-get ᬠá–្á™á¶á™á¶á˜á”្áá¾â€‹á‡á¶á˜á½á™ --" -"fix- áែá›á”á¶á់á¬áŸ‹Â ?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix- áែá›á”á¶á់​ á“á·á„ ​áŸáŸ’áœá”​á˜áŸáŒáŸ€â€‹áែá›â€‹á˜á·á“á”á¶á“​​á‚á¶áŸ†á‘្áá“ៅá–áŸá›â€‹á”á…្á…á»á”្á”á“្á“​" @@ -1971,17 +1975,6 @@ msgstr[0] "" msgstr[1] "" #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "á¢áŸ’á“á€â€‹á”្áá ែá›â€‹á‡á¶â€‹á…á„់​áá់ 'apt-get -f install' áá¾á˜áŸ’á”á¸â€‹á€áŸ‚​á–á½á€â€‹áœá¶â€‹á‘á¶áŸ†á„​á“áŸáŸ‡Â ៖" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"á—á¶á–á¢áŸáŸ’ááŸá™â€‹áែá›â€‹áá»áŸâ€‹á‚្á“á¶Â ។ á–្á™á¶á™á¶á˜â€‹ 'apt-get -f install' áោá™â€‹á‚្á˜á¶á“​á€á‰áŸ’á…á”់ (ᬠá”á‰áŸ’á‡á¶á€áŸ‹â€‹áំáោះáŸáŸ’áá¶á™) ។" - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "á€á‰áŸ’á…á”់​á”á“្áែá˜â€‹áá¼á…áá‘ៅá“áŸáŸ‡ á“á¹á„á្áá¼áœá”á¶á“​áំá¡á¾á„ ៖" @@ -2361,7 +2354,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "á–á¶á€áŸ’á™â€‹á”á‰áŸ’á‡á¶â€‹áŸáŸ’áá¶á™ '%s' á”á¶á“​á”áá¶á‡áŸá™â€‹Â ។\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "á–á·á“á·á្á™â€‹á”្ááŸá·á“​á”á¾á€á‰áŸ’á…á”់ 'dpkg-dev' á˜á·á“​á‘á¶á“់​á”á¶á“​áំá¡á¾á„​ ។\n" @@ -3330,6 +3322,53 @@ msgstr " %s á‚្á˜á¶á“​á’á¶áá»â€‹á”áá·áŸáŸá’​á”្áá—á msgid " %s has no binary override entry either\n" msgstr " %s á‚្á˜á¶á“​á’á¶áá»á”​áá·áŸáŸá’á‚ោá›â€‹á–á¸á​áែá\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "á€áŸ†á–á»á„​áá„់á…á¶áŸ†â€‹á”á‹á˜á€áá¶" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "á˜áŸ‰á¶áŸáŸá¸á“​á”á˜áŸ’áá¾â€‹ HTTP á”á¶á“á•áŸ’á‰á¾á”á‹á˜á€áá¶á…á˜áŸ’á›á¾á™áá”á˜á·á“á្áá¹á˜á្áá¼áœ" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "á‡á½á​á”á‹á˜á€áá¶â€‹áá¼á…​" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "á˜áŸ‰á¶áŸáŸá¸á“​á”á˜áŸ’áá¾â€‹ HTTP á”á¶á“á•áŸ’á‰á¾â€‹â€‹á”á‹á˜á€áá¶á”្ááœáŸ‚á„​​​á˜á¶áá·á€á¶â€‹á˜á·á“á្áá¹á˜á្áá¼áœâ€‹" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "á˜áŸ‰á¶áŸáŸá¸á“​á”á˜áŸ’áá¾â€‹ HTTP á”á¶á“á•áŸ’á‰á¾â€‹á”á‹á˜á€áá¶â€‹á‡á½á​á˜á¶áá·á€á¶â€‹á˜á·á“​á្áá¹á˜á្áá¼áœâ€‹" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "á˜áŸ‰á¶áŸáŸá¸á“​á”á˜áŸ’áá¾ HTTP á“áŸáŸ‡á”á¶á“​áá¼á…​​​á‡á½á​á‚á¶áŸ†á‘្á​" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "á˜á·á“áŸáŸ’á‚á¶á›áŸ‹â€‹á‘្áá„់á‘្áá¶á™â€‹á€á¶á›á”áá·á…្á†áŸá‘" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "á‘á·á“្á“á“áŸá™â€‹á”á‹á˜á€áá¶â€‹áá¼á…" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "á€á¶ááá—្á‡á¶á”់​á”á¶á“​á”áá¶á‡áŸá™â€‹" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "á€áŸ†á á»áŸâ€‹áá¶á„​á€áŸ’á“á»á„​" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3679,57 +3718,16 @@ msgstr "á”áá¶á‡áŸá™á€áŸ’á“á»á„á€á¶áá€áŸ†áá់​á–áŸá›áœ msgid "Connection closed prematurely" msgstr "á”á¶á“​á”á·á‘​á€á¶á​áá—្á‡á¶á”់​á˜á»á“​á–áŸá›" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "á€áŸ†á–á»á„​áá„់á…á¶áŸ†â€‹á”á‹á˜á€áá¶" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "á˜áŸ‰á¶áŸáŸá¸á“​á”á˜áŸ’áá¾â€‹ HTTP á”á¶á“á•áŸ’á‰á¾á”á‹á˜á€áá¶á…á˜áŸ’á›á¾á™áá”á˜á·á“á្áá¹á˜á្áá¼áœ" - -#: methods/server.cc -msgid "Bad header line" -msgstr "á‡á½á​á”á‹á˜á€áá¶â€‹áá¼á…​" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "á˜áŸ‰á¶áŸáŸá¸á“​á”á˜áŸ’áá¾â€‹ HTTP á”á¶á“á•áŸ’á‰á¾â€‹â€‹á”á‹á˜á€áá¶á”្ááœáŸ‚á„​​​á˜á¶áá·á€á¶â€‹á˜á·á“á្áá¹á˜á្áá¼áœâ€‹" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "á˜áŸ‰á¶áŸáŸá¸á“​á”á˜áŸ’áá¾â€‹ HTTP á”á¶á“á•áŸ’á‰á¾â€‹á”á‹á˜á€áá¶â€‹á‡á½á​á˜á¶áá·á€á¶â€‹á˜á·á“​á្áá¹á˜á្áá¼áœâ€‹" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "á˜áŸ‰á¶áŸáŸá¸á“​á”á˜áŸ’áá¾ HTTP á“áŸáŸ‡á”á¶á“​áá¼á…​​​á‡á½á​á‚á¶áŸ†á‘្á​" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "á˜á·á“áŸáŸ’á‚á¶á›áŸ‹â€‹á‘្áá„់á‘្áá¶á™â€‹á€á¶á›á”áá·á…្á†áŸá‘" - -#: methods/server.cc -msgid "Bad header data" -msgstr "á‘á·á“្á“á“áŸá™â€‹á”á‹á˜á€áá¶â€‹áá¼á…" - -#: methods/server.cc -msgid "Connection failed" -msgstr "á€á¶ááá—្á‡á¶á”់​á”á¶á“​á”áá¶á‡áŸá™â€‹" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "á€áŸ†á á»áŸâ€‹áá¶á„​á€áŸ’á“á»á„​" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "á—á¶á–​á¢á¶áŸáŸ’ááŸá™â€‹áែá›â€‹áá»áŸâ€‹á‚្á“á¶Â ។ á–្á™á¶á™á¶á˜â€‹á€á¶á​á”្áá¾ --fix-broken ។" + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "á¢áŸ’á“á€â€‹á”្áá ែá›â€‹á‡á¶â€‹á…á„់​áá់ 'apt --fix-broken install' áá¾á˜áŸ’á”á¸â€‹á€áŸ‚​á–á½á€â€‹áœá¶â€‹á‘á¶áŸ†á„​á“áŸáŸ‡Â ៖" + #~ msgid "(not found)" #~ msgstr "(áá€â€‹á˜á·á“​áƒá¾á‰)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -407,8 +407,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1616,14 +1616,20 @@ msgstr "́—…ê·¸ë ˆ́´ë“œ ́§‘í•©́„ ́µœ́†Œí™”í• ́ˆ˜ ́—†́µë‹ˆë‹¤" msgid " Done" msgstr " ́™„료" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "" -"́´ ́ƒí™©́„ 바로́¡́œ¼ë ¤ë©´ 'apt-get -f install'́„ ́‹¤í–‰í•´́•¼ í• ́ˆ˜ë„ ́ˆ́µë‹ˆë‹¤." +"́´ ́ƒí™©́„ 바로́¡́œ¼ë ¤ë©´ 'apt --fix-broken install'́„ ́‹¤í–‰í•´́•¼ í• ́ˆ˜ë„ ́ˆ́µë‹ˆ" +"다." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "́˜́¡´́„±́´ ë§́§€ ́•́µë‹ˆë‹¤. -f ́˜µ́…˜́„ ́‚¬́©í•´ ë³´́‹́‹œ́˜¤." +# FIXME: specify a solution? 무́¨ ́†”ë£΅…˜? +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"́˜́¡´́„±́´ ë§́§€ ́•́µë‹ˆë‹¤. 패키́§€ ́—†́´ 'apt --fix-broken install'́„ ́‹œë„í•´ ë³´́‹" +"́‹œ́˜¤ (́•„니면 í•´ê²° 방법́„ ́§€́ •í•˜́‹́‹œ́˜¤)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1806,6 +1812,14 @@ msgid "Broken packages" msgstr "ë§ê°€́§„ 패키́§€" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"́•„́¹´́´ë¸Œë¥¼ ë°›́„ ́ˆ˜ ́—†́µë‹ˆë‹¤. ́•„ë§ˆë„ apt-get update를 ́‹¤í–‰í•´́•¼ 하거나 --fix-" +"missing ́˜µ́…˜́„ ́¤˜́„œ ́‹¤í–‰í•´́•¼ í• ê²ƒ́…니다." + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "내부 ́˜¤ë¥˜. ë§ê°€́§„ 패키́§€́—́„œ InstallPackages를 호́¶œí–ˆ́µë‹ˆë‹¤!" @@ -1910,14 +1924,6 @@ msgid "Download complete and in download only mode" msgstr "다́´ë¡œë“œë¥¼ 마́³¤ê³ 다́´ë¡œë“œ ́ „́© 모드́…니다" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"́•„́¹´́´ë¸Œë¥¼ ë°›́„ ́ˆ˜ ́—†́µë‹ˆë‹¤. ́•„ë§ˆë„ apt-get update를 ́‹¤í–‰í•´́•¼ 하거나 --fix-" -"missing ́˜µ́…˜́„ ́¤˜́„œ ́‹¤í–‰í•´́•¼ í• ê²ƒ́…니다." - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ́˜µ́…˜ê³¼ ë™́‹œ́— 미디́–´ ë°”ê¾¸ê¸°ë” í˜„́¬ ́§€́›í•˜́§€ ́•́µë‹ˆë‹¤" @@ -1982,19 +1988,6 @@ msgid_plural "Use '%s' to remove them." msgstr[0] "́´ë“¤́„ ́§€́°ë ¤ë©´ '%s'를 ́‚¬́©í•˜́‹́‹œ́˜¤." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "다́Œ́„ 바로́¡́œ¼ë ¤ë©´ 'apt-get -f install'́„ ́‹¤í–‰í•´ ë³´́‹́‹œ́˜¤:" - -# FIXME: specify a solution? 무́¨ ́†”ë£΅…˜? -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"́˜́¡´́„±́´ ë§́§€ ́•́µë‹ˆë‹¤. 패키́§€ ́—†́´ 'apt-get -f install'́„ ́‹œë„í•´ ë³´́‹́‹œ́˜¤ " -"(́•„니면 í•´ê²° 방법́„ ́§€́ •í•˜́‹́‹œ́˜¤)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "다́Œ 패키́§€ë¥¼ ë” ́„¤́¹˜í• 것́…니다:" @@ -2381,7 +2374,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "́••́¶• 풀기 ëª…ë ¹ '%s' ́‹¤íŒ¨.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' 패키́§€ê°€ ́„¤́¹˜ë˜́—ˆë”́§€ë¥¼ 확́¸í•˜́‹́‹œ́˜¤.\n" @@ -3343,6 +3335,53 @@ msgstr " %ś—ë” source override í•ëª©́´ ́—†́µë‹ˆë‹¤\n" msgid " %s has no binary override entry either\n" msgstr " %ś—ë” binary override í•ëª©́´ ́—†́µë‹ˆë‹¤\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "í—¤ë”를 ê¸°ë‹¤ë¦¬ë” ́¤‘́…니다" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP ́„œë²„́—́„œ ́˜ëª»ëœ ́‘답 í—¤ë”를 보냈́µë‹ˆë‹¤" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "í—¤ë” ́¤„́´ ́˜ëª»ë˜́—ˆ́µë‹ˆë‹¤" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP ́„œë²„́—́„œ ́˜ëª»ëœ Content-Length í—¤ë”를 보냈́µë‹ˆë‹¤" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP ́„œë²„́—́„œ ́˜ëª»ëœ Content-Range í—¤ë”를 보냈́µë‹ˆë‹¤" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "HTTP ́„œë²„́— ë²”́œ„ ́§€́› 기ë¥́´ ́˜ëª»ë˜́–´ ́ˆ́µë‹ˆë‹¤" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "ë°́´í„° 형́‹́„ ́•Œ ́ˆ˜ ́—†́µë‹ˆë‹¤" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "í—¤ë” ë°́´í„°ê°€ ́˜ëª»ë˜́—ˆ́µë‹ˆë‹¤" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "́—°ê²°́´ ́‹¤íŒ¨í–ˆ́µë‹ˆë‹¤" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "내부 ́˜¤ë¥˜" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3694,57 +3733,16 @@ msgstr "파́¼ 변경 ́‹œê°́„ ́„¤́ •í•˜ë”ë° ́‹¤íŒ¨í–ˆ́µë‹ˆë‹¤" msgid "Connection closed prematurely" msgstr "́—°ê²°́´ 너무 빨리 ë́–´́¡Œ́µë‹ˆë‹¤" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "í—¤ë”를 ê¸°ë‹¤ë¦¬ë” ́¤‘́…니다" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "HTTP ́„œë²„́—́„œ ́˜ëª»ëœ ́‘답 í—¤ë”를 보냈́µë‹ˆë‹¤" - -#: methods/server.cc -msgid "Bad header line" -msgstr "í—¤ë” ́¤„́´ ́˜ëª»ë˜́—ˆ́µë‹ˆë‹¤" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "HTTP ́„œë²„́—́„œ ́˜ëª»ëœ Content-Length í—¤ë”를 보냈́µë‹ˆë‹¤" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "HTTP ́„œë²„́—́„œ ́˜ëª»ëœ Content-Range í—¤ë”를 보냈́µë‹ˆë‹¤" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "HTTP ́„œë²„́— ë²”́œ„ ́§€́› 기ë¥́´ ́˜ëª»ë˜́–´ ́ˆ́µë‹ˆë‹¤" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "ë°́´í„° 형́‹́„ ́•Œ ́ˆ˜ ́—†́µë‹ˆë‹¤" - -#: methods/server.cc -msgid "Bad header data" -msgstr "í—¤ë” ë°́´í„°ê°€ ́˜ëª»ë˜́—ˆ́µë‹ˆë‹¤" - -#: methods/server.cc -msgid "Connection failed" -msgstr "́—°ê²°́´ ́‹¤íŒ¨í–ˆ́µë‹ˆë‹¤" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "내부 ́˜¤ë¥˜" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "́˜́¡´́„±́´ ë§́§€ ́•́µë‹ˆë‹¤. --fix-broken ́˜µ́…˜́„ ́‚¬́©í•´ ë³´́‹́‹œ́˜¤." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "다́Œ́„ 바로́¡́œ¼ë ¤ë©´ 'apt --fix-broken install'́„ ́‹¤í–‰í•´ ë³´́‹́‹œ́˜¤:" + #~ msgid "(not found)" #~ msgstr "(́—†́Œ)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -406,8 +406,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1587,12 +1587,14 @@ msgstr "" msgid " Done" msgstr " Temam" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "" -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." msgstr "" #: apt-private/private-cacheset.cc apt-private/private-search.cc @@ -1771,6 +1773,12 @@ msgid "Broken packages" msgstr "PaketĂªn ÅŸikestĂ®" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" @@ -1865,12 +1873,6 @@ msgid "Download complete and in download only mode" msgstr "" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "" @@ -1936,16 +1938,6 @@ msgstr[0] "" msgstr[1] "" #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Ev pakĂªtĂªn NĂ› dĂª werine sazkirin:" @@ -2324,7 +2316,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" @@ -3231,6 +3222,53 @@ msgstr "" msgid " %s has no binary override entry either\n" msgstr "" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "GirĂªdan pĂªk nehatiye" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Çewtiya hundirĂ®n" + #: methods/cdrom.cc #, fuzzy, c-format msgid "Unable to read the cdrom database %s" @@ -3580,53 +3618,6 @@ msgstr "" msgid "Connection closed prematurely" msgstr "GirĂªdan zĂ» hatiye girtin" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "" - -#: methods/server.cc -msgid "Bad header line" -msgstr "" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "" - -#: methods/server.cc -msgid "Bad header data" -msgstr "" - -#: methods/server.cc -msgid "Connection failed" -msgstr "GirĂªdan pĂªk nehatiye" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Çewtiya hundirĂ®n" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -406,8 +406,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1596,13 +1596,18 @@ msgstr "Nepavyko minimizuoti atnaujinimo rinkinio" msgid " Done" msgstr " Ä®vykdyta" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Ä®vykdykite â€apt-get -f install“, jei norite iÅ¡taisyti Å¡ias klaidas." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "" +"Ä®vykdykite â€apt --fix-broken install“, jei norite iÅ¡taisyti Å¡ias klaidas." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Nepatenkintos priklausomybÄ—s. Bandykit naudoti -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Nepatenkintos priklausomybÄ—s. Pabandykite įvykdyti 'apt --fix-broken " +"install' be nurodytų paketų (arba nurodykite iÅ¡eitį)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1787,6 +1792,14 @@ msgid "Broken packages" msgstr "Sugadinti paketai" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Nepavyko parsiųsti kai kurių archyvų, pabandykite paleisti â€apt-get update“ " +"arba pabandykite su parametru --fix-missing?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" @@ -1886,14 +1899,6 @@ msgid "Download complete and in download only mode" msgstr "Pavyko parsiųsti tik parsiuntimo režime" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Nepavyko parsiųsti kai kurių archyvų, pabandykite paleisti â€apt-get update“ " -"arba pabandykite su parametru --fix-missing?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing bei laikmenų apkeitimas nepalaikomas" @@ -1959,18 +1964,6 @@ msgstr[0] "NorÄ—dami juos paÅ¡alinti, paleiskite â€%s“" msgstr[1] "NorÄ—dami juos paÅ¡alinti, paleiskite â€%s“" #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "JÅ«s galite norÄ—ti paleisti 'apt-get -f install\" klaidų taisymui:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Nepatenkintos priklausomybÄ—s. Pabandykite įvykdyti 'apt-get -f install' be " -"nurodytų paketų (arba nurodykite iÅ¡eitį)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Bus įdiegti Å¡ie papildomi paketai:" @@ -2351,7 +2344,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Nepavyko įvykdyti iÅ¡pakavimo komandos â€%s“\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Patikrinkite, ar įdiegtas â€dpkg-dev“ paketas.\n" @@ -3328,6 +3320,53 @@ msgstr "" msgid " %s has no binary override entry either\n" msgstr "" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Laukiama antraÅ¡Äių" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Prisijungti nepavyko" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "VidinÄ— klaida" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3673,57 +3712,17 @@ msgstr "" msgid "Connection closed prematurely" msgstr "" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Laukiama antraÅ¡Äių" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "" - -#: methods/server.cc -msgid "Bad header line" -msgstr "" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "" - -#: methods/server.cc -msgid "Bad header data" -msgstr "" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Prisijungti nepavyko" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "VidinÄ— klaida" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "Nepatenkintos priklausomybÄ—s. Bandykit naudoti --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "JÅ«s galite norÄ—ti paleisti 'apt --fix-broken install\" klaidų taisymui:" + #~ msgid "(not found)" #~ msgstr "(nerasta)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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 " @@ -407,8 +407,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1607,13 +1607,17 @@ msgstr "आवृतà¥à¤¤à¥€à¤•à¥ƒà¤¤ संठकमीतकमी करण msgid " Done" msgstr "à¤à¤¾à¤²à¥‡" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "हे बरोबर करणà¥à¤¯à¤¾à¤¸à¤¾à¤ ी तà¥à¤®à¥à¤¹à¤¾à¤²à¤¾ `apt-get -f संसà¥à¤¥à¤¾à¤ªà¤¨à¤¾' पà¥à¤°à¥‹à¤—à¥à¤°à¤¾à¤® à¤à¤¾à¤²à¥‚ करावा लागेल." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "अनमेट डिपेंडनà¥à¤¸à¥€à¤œ.-f.वापरून पà¥à¤°à¤¯à¤¤à¥à¤¨ करा " +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"अनमेट डिपेंडनà¥à¤¸à¥€à¤œ.à¤à¤ªà¥€à¤Ÿà¥€-गेट -à¤à¤« संसà¥à¤¥à¤¾à¤ªà¤¨ ('apt --fix-broken install') पॅकेजशिवाय " +"पà¥à¤°à¤¯à¤¤à¥à¤¨ करा (किंवा परà¥à¤¯à¤¾à¤¯ सांगा)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1799,6 +1803,14 @@ msgid "Broken packages" msgstr "तà¥à¤Ÿà¤²à¥‡à¤²à¥€ पॅकेजेस" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"काही आरà¥à¤•à¤¾à¤‡à¤µà¥à¤¹à¤œ आणणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥, कदाà¤à¤¿à¤¤ apt-get रन करà¥à¤¨ अदà¥à¤¯à¤¯à¤¾à¤µà¤¤ करा किंवा --fix- " +"बरोबर पà¥à¤°à¤¯à¤¤à¥à¤¨ कराहरवलेले/गहाळ?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "अंतरà¥à¤—त तà¥à¤°à¥à¤Ÿà¥€, तà¥à¤Ÿà¤²à¥‡à¤²à¥à¤¯à¤¾ पॅकेजेस बरोबर संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ पॅकेजला आवाहन केले गेले/बोलावले गेले!" @@ -1899,14 +1911,6 @@ msgid "Download complete and in download only mode" msgstr "डाà¤à¤¨à¤²à¥‹à¤¡ संपूरà¥à¤£ आणि डाà¤à¤¨à¤²à¥‹à¤¡ मधà¥à¤¯à¥‡ फकà¥à¤¤ पदà¥à¤§à¤¤à¥€" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"काही आरà¥à¤•à¤¾à¤‡à¤µà¥à¤¹à¤œ आणणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥, कदाà¤à¤¿à¤¤ apt-get रन करà¥à¤¨ अदà¥à¤¯à¤¯à¤¾à¤µà¤¤ करा किंवा --fix- " -"बरोबर पà¥à¤°à¤¯à¤¤à¥à¤¨ कराहरवलेले/गहाळ?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "" "--fix- सापडत नाही आणि माधà¥à¤¯à¤®/मिडिया अदलाबदल हे सधà¥à¤¯à¤¾ तांतà¥à¤°à¤¿à¤• मदत देठशकत नाही" @@ -1975,20 +1979,6 @@ msgstr[0] "ती काढून टाकणà¥à¤¯à¤¾à¤¸à¤¾à¤ ी '%s' वाà msgstr[1] "ती काढून टाकणà¥à¤¯à¤¾à¤¸à¤¾à¤ ी '%s' वापरा." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "" -"तà¥à¤®à¥à¤¹à¤¾à¤²à¤¾ कदाà¤à¤¿à¤¤ 'apt-get -f install'(à¤à¤ªà¥€à¤Ÿà¥€-गेट -à¤à¤« संसà¥à¤¥à¤¾à¤ªà¤¨') पà¥à¤°à¥‹à¤—à¥à¤°à¤¾à¤® à¤à¤¾à¤²à¥‚ करावा " -"लागेल'यात बदल करणà¥à¤¯à¤¾à¤¸à¤¾à¤ ी:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"अनमेट डिपेंडनà¥à¤¸à¥€à¤œ.à¤à¤ªà¥€à¤Ÿà¥€-गेट -à¤à¤« संसà¥à¤¥à¤¾à¤ªà¤¨ ('apt-get -f install') पॅकेजशिवाय पà¥à¤°à¤¯à¤¤à¥à¤¨ करा " -"(किंवा परà¥à¤¯à¤¾à¤¯ सांगा)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "खालील अतिरिकà¥à¤¤ पॅकेजेस संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ होतील:" @@ -2368,7 +2358,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "'%s' आजà¥à¤à¤¾ सà¥à¤Ÿà¥à¤¯à¤¾ करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' पॅकेज संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ केले आहे का ते पडताळून पहा.\n" @@ -3331,6 +3320,53 @@ msgstr "%s ला उगम ओवà¥à¤¹à¤°à¤°à¤¾à¤ˆà¤¡/दà¥à¤°à¥à¤²à¤•à¥à¤· msgid " %s has no binary override entry either\n" msgstr "%s ला दà¥à¤µà¤¯à¤‚क ओवà¥à¤¹à¤°à¤°à¤¾à¤ˆà¤¡ जागा नाही\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "शीरà¥à¤·à¤•à¤¾à¤¸à¤¾à¤ ी थांबले आहे...." + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ अवैध पà¥à¤°à¤¤à¥à¤¤à¥à¤¯à¥à¤¤à¥à¤¤à¤° शीरà¥à¤·à¤• पाठविले" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "वाईट शीरà¥à¤·à¤• ओळ" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ अवैध मजकूर-लांबी शीरà¥à¤·à¤• पाठविले " + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ अवैध मजकूर-विसà¥à¤¤à¤¾à¤° शीरà¥à¤·à¤• पाठविले" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "HTTP सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ विसà¥à¤¤à¤¾à¤° तांतà¥à¤°à¤¿à¤• मदत जोडली" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "अपरिà¤à¤¿à¤¤ दिनांक पà¥à¤°à¤•à¤¾à¤°/सà¥à¤µà¤°à¥‚प " + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "à¤à¥à¤•à¥€à¤à¤¾ शीरà¥à¤·à¤• डाटा" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "जोडणी अयशसà¥à¤µà¥€" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "अंतरà¥à¤—त तà¥à¤°à¥à¤Ÿà¥€" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3682,57 +3718,18 @@ msgstr "बदलणà¥à¤¯à¤¾à¤à¤¾ वेळ निशà¥à¤à¤¿à¤¤ करणॠmsgid "Connection closed prematurely" msgstr "जोडणी अकाली बंद à¤à¤¾à¤²à¥€" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "शीरà¥à¤·à¤•à¤¾à¤¸à¤¾à¤ ी थांबले आहे...." - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "HTTP सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ अवैध पà¥à¤°à¤¤à¥à¤¤à¥à¤¯à¥à¤¤à¥à¤¤à¤° शीरà¥à¤·à¤• पाठविले" - -#: methods/server.cc -msgid "Bad header line" -msgstr "वाईट शीरà¥à¤·à¤• ओळ" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "HTTP सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ अवैध मजकूर-लांबी शीरà¥à¤·à¤• पाठविले " - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "HTTP सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ अवैध मजकूर-विसà¥à¤¤à¤¾à¤° शीरà¥à¤·à¤• पाठविले" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "HTTP सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ विसà¥à¤¤à¤¾à¤° तांतà¥à¤°à¤¿à¤• मदत जोडली" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "अपरिà¤à¤¿à¤¤ दिनांक पà¥à¤°à¤•à¤¾à¤°/सà¥à¤µà¤°à¥‚प " - -#: methods/server.cc -msgid "Bad header data" -msgstr "à¤à¥à¤•à¥€à¤à¤¾ शीरà¥à¤·à¤• डाटा" - -#: methods/server.cc -msgid "Connection failed" -msgstr "जोडणी अयशसà¥à¤µà¥€" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "अंतरà¥à¤—त तà¥à¤°à¥à¤Ÿà¥€" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "अनमेट डिपेंडनà¥à¤¸à¥€à¤œ.--fix-broken.वापरून पà¥à¤°à¤¯à¤¤à¥à¤¨ करा " + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "तà¥à¤®à¥à¤¹à¤¾à¤²à¤¾ कदाà¤à¤¿à¤¤ 'apt --fix-broken install'(à¤à¤ªà¥€à¤Ÿà¥€-गेट -à¤à¤« संसà¥à¤¥à¤¾à¤ªà¤¨') पà¥à¤°à¥‹à¤—à¥à¤°à¤¾à¤® " +#~ "à¤à¤¾à¤²à¥‚ करावा लागेल'यात बदल करणà¥à¤¯à¤¾à¤¸à¤¾à¤ ी:" + #~ msgid "(not found)" #~ msgstr "(मिळाले नाही)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\n" "PO-Revision-Date: 2016-06-11 22:38+0200\n" "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n" "Language-Team: Norwegian BokmĂ¥l <i18n-no@lister.ping.uio.no>\n" @@ -413,8 +413,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1635,13 +1635,17 @@ msgstr "Klarer ikke Ă¥ minimere oppgraderingsettet" msgid " Done" msgstr " Utført" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Du vil kanskje kjøre «apt-get -f install» for Ă¥ rette pĂ¥ dette." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "Du vil kanskje kjøre «apt --fix-broken install» for Ă¥ rette pĂ¥ dette." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Uinnfridde avhengighetsforhold. Prøv «apt --fix-broken install» uten pakker " +"(eller angi en løsning)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1830,6 +1834,14 @@ msgid "Broken packages" msgstr "Ă˜delagte pakker" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Klarte ikke Ă¥ hente alle arkivene. Du kan prøve med «apt-get update» eller " +"«--fix-missing»." + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!" @@ -1934,14 +1946,6 @@ msgid "Download complete and in download only mode" msgstr "Nedlasting fullført med innstillinga «bare nedlasting»" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Klarte ikke Ă¥ hente alle arkivene. Du kan prøve med «apt-get update» eller " -"«--fix-missing»." - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "«--fix-missing» og bytte av media støttes nĂ¥ ikke" @@ -2014,18 +2018,6 @@ msgstr[0] "Bruk «%s» for Ă¥ fjerne den." msgstr[1] "Bruk «%s» for Ă¥ fjerne dem." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Du vil kanskje utføre «apt-get -f install» for Ă¥ rette pĂ¥ disse:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller " -"angi en løsning)." - -#: apt-private/private-install.cc msgid "The following additional packages will be installed:" msgstr "Følgende ekstra pakker vil bli installert:" @@ -2421,7 +2413,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislyktes.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Sjekk om pakken «dpkg-dev» er installert.\n" @@ -3397,6 +3388,53 @@ msgstr " %s har ingen kildeoverstyringsoppføring\n" msgid " %s has no binary override entry either\n" msgstr " %s har ingen binæroverstyringsoppføring heller\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Venter pĂ¥ hoder" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP-tjeneren sendte et ugyldig svarhode" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Ă˜delagt hodelinje" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Denne HTTP-tjeneren har ødelagt støtte for omrĂ¥de" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Ukjent datoformat" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Ă˜delagte hodedata" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Forbindelsen mislykkes" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Intern feil" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3752,57 +3790,17 @@ msgstr "Klarte ikke Ă¥ sette endringstidspunkt" msgid "Connection closed prematurely" msgstr "Forbindelsen ble uventet stengt" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Venter pĂ¥ hoder" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "HTTP-tjeneren sendte et ugyldig svarhode" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Ă˜delagt hodelinje" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Denne HTTP-tjeneren har ødelagt støtte for omrĂ¥de" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Ukjent datoformat" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Ă˜delagte hodedata" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Forbindelsen mislykkes" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Intern feil" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "Tomme filer kan ikke være gyldige arkiver" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "Uinnfridde avhengighetsforhold - Prøv «--fix-broken»." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "Du vil kanskje utføre «apt --fix-broken install» for Ă¥ rette pĂ¥ disse:" + #~ msgid "Failed to fetch %s %s\n" #~ msgstr "Klarte ikke Ă¥ skaffe %s %s\n" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -406,8 +406,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1602,13 +1602,17 @@ msgstr "सà¥à¤¤à¤° वृदà¥à¤§à¤¿ सेटलाई नà¥à¤¯à¥‚नतम msgid " Done" msgstr "काम à¤à¤¯à¥‹" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "यी सà¥à¤§à¤¾à¤° गरà¥à¤¨ तपाईà¤à¤²à¥‡ 'apt-get -f install' à¤à¤²à¤¾à¤‰à¤¨ परà¥à¤› ।" +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "यी सà¥à¤§à¤¾à¤° गरà¥à¤¨ तपाईà¤à¤²à¥‡ 'apt --fix-broken install' à¤à¤²à¤¾à¤‰à¤¨ परà¥à¤› ।" -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "नà¤à¥‡à¤Ÿà¤¿à¤à¤•à¤¾ निरà¥à¤à¤°à¤¤à¤¾à¤¹à¤°à¥‚ । -f पà¥à¤°à¤¯à¥‹à¤— गरेर पà¥à¤°à¤¯à¤¾à¤¸ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।" +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"नà¤à¥‡à¤Ÿà¤¿à¤à¤•à¤¾ निरà¥à¤à¤°à¤¤à¤¾à¤¹à¤°à¥‚ । पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ बिना 'apt --fix-broken install' पà¥à¤°à¤¯à¤¾à¤¸ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ " +"( वा समाधान निरà¥à¤¦à¤¿à¤·à¥à¤Ÿ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥) ।" #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1795,6 +1799,14 @@ msgid "Broken packages" msgstr "à¤à¤¾à¤à¤à¤¿à¤à¤•à¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"केही संगà¥à¤°à¤¹à¤¹à¤°à¥‚ तानà¥à¤¨ असकà¥à¤·à¤® à¤à¤¯à¥‹,apt-get अदà¥à¤¯à¤¾à¤µà¤§à¤¿à¤• à¤à¤²à¤¿à¤°à¤¹à¥‡à¤› वा हराइरहेको --fix-संगै पà¥à¤°à¤¯à¤¾à¤¸ " +"गरà¥à¤¨à¥à¤¹à¥à¤¨à¥à¤› ?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿, सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥à¤²à¤¾à¤ˆ à¤à¤¾à¤à¤à¤¿à¤à¤•à¥‹ पà¥à¤¯à¤¾à¤•à¥‡à¤œ à¤à¤¨à¤¿à¤¨à¥à¤¥à¥à¤¯à¥‹!" @@ -1895,14 +1907,6 @@ msgid "Download complete and in download only mode" msgstr "डाउनलोड समापà¥à¤¤ à¤à¤¯à¥‹ र डाउनलोडमा मोड मातà¥à¤°à¥ˆ छ" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"केही संगà¥à¤°à¤¹à¤¹à¤°à¥‚ तानà¥à¤¨ असकà¥à¤·à¤® à¤à¤¯à¥‹,apt-get अदà¥à¤¯à¤¾à¤µà¤§à¤¿à¤• à¤à¤²à¤¿à¤°à¤¹à¥‡à¤› वा हराइरहेको --fix-संगै पà¥à¤°à¤¯à¤¾à¤¸ " -"गरà¥à¤¨à¥à¤¹à¥à¤¨à¥à¤› ?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "हराइरहेको --fix-र सà¥à¤µà¤¾à¤ª à¤à¤‡à¤°à¤¹à¥‡à¤•à¥‹ मेडिया हाल समरà¥à¤¥à¤¿à¤¤ à¤à¤‡à¤°à¤¹à¥‡à¤•à¥‹ छैन" @@ -1969,18 +1973,6 @@ msgstr[0] "" msgstr[1] "" #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "तपाईठयसलाई सà¥à¤§à¤¾à¤° गरà¥à¤¨ 'apt-get -f install' à¤à¤²à¤¾à¤‰à¤¨ à¤à¤¾à¤¹à¤¨à¥à¤¹à¥à¤¨à¥à¤›:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"नà¤à¥‡à¤Ÿà¤¿à¤à¤•à¤¾ निरà¥à¤à¤°à¤¤à¤¾à¤¹à¤°à¥‚ । पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ बिना 'apt-get -f install' पà¥à¤°à¤¯à¤¾à¤¸ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ( वा " -"समाधान निरà¥à¤¦à¤¿à¤·à¥à¤Ÿ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥) ।" - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "निमà¥à¤¨ अतिरिकà¥à¤¤ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ हà¥à¤¨à¥‡à¤›à¤¨à¥:" @@ -2360,7 +2352,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "अनपà¥à¤¯à¤¾à¤• आदेश '%s' असफल à¤à¤¯à¥‹ ।\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "जाà¤à¤à¥à¤¨à¥à¤¹à¥‹à¤¸à¥ यदि 'dpkg-dev' पà¥à¤¯à¤¾à¤•à¥‡à¤œ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ à¤à¤¯à¥‹ ।\n" @@ -3329,6 +3320,53 @@ msgstr " %s संग कà¥à¤¨à¥ˆ अधिलेखन पà¥à¤°à¤µà¤¿à¤·à¥ msgid " %s has no binary override entry either\n" msgstr " %s संग कà¥à¤¨à¥ˆ अधिलेखन पà¥à¤°à¤µà¤¿à¤·à¥à¤Ÿà¤¿ छैन\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "हेडरहरà¥à¤•à¥‹ लागि परà¥à¤–िदैछ" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP सरà¥à¤à¤°à¤²à¥‡ अवैध जवाफ हेडर पठायो" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "खराब हेडर लाइन" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP सरà¥à¤à¤°à¤²à¥‡ अवैध सामगà¥à¤°à¥€-लमà¥à¤¬à¤¾à¤ˆ हेडर पठायो" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP सरà¥à¤à¤°à¤²à¥‡ अवैध सामगà¥à¤°à¥€-दायरा हेडर पठायो" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "HTTP सरà¥à¤à¤° संग à¤à¤¾à¤à¤à¤¿à¤à¤•à¥‹ दायरा समरà¥à¤¥à¤¨ छ" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "अजà¥à¤à¤¾à¤¤ मिति ढाà¤à¤à¤¾" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "खराब हेडर डेटा" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "जडान असफल à¤à¤¯à¥‹" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3679,57 +3717,16 @@ msgstr "परिमारà¥à¤œà¤¨ समय सेट असफल à¤à¤¯à¥‹" msgid "Connection closed prematurely" msgstr "जडान असमायिक बनà¥à¤¦ à¤à¤¯à¥‹" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "हेडरहरà¥à¤•à¥‹ लागि परà¥à¤–िदैछ" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "HTTP सरà¥à¤à¤°à¤²à¥‡ अवैध जवाफ हेडर पठायो" - -#: methods/server.cc -msgid "Bad header line" -msgstr "खराब हेडर लाइन" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "HTTP सरà¥à¤à¤°à¤²à¥‡ अवैध सामगà¥à¤°à¥€-लमà¥à¤¬à¤¾à¤ˆ हेडर पठायो" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "HTTP सरà¥à¤à¤°à¤²à¥‡ अवैध सामगà¥à¤°à¥€-दायरा हेडर पठायो" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "HTTP सरà¥à¤à¤° संग à¤à¤¾à¤à¤à¤¿à¤à¤•à¥‹ दायरा समरà¥à¤¥à¤¨ छ" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "अजà¥à¤à¤¾à¤¤ मिति ढाà¤à¤à¤¾" - -#: methods/server.cc -msgid "Bad header data" -msgstr "खराब हेडर डेटा" - -#: methods/server.cc -msgid "Connection failed" -msgstr "जडान असफल à¤à¤¯à¥‹" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "नà¤à¥‡à¤Ÿà¤¿à¤à¤•à¤¾ निरà¥à¤à¤°à¤¤à¤¾à¤¹à¤°à¥‚ । --fix-broken पà¥à¤°à¤¯à¥‹à¤— गरेर पà¥à¤°à¤¯à¤¾à¤¸ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।" + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "तपाईठयसलाई सà¥à¤§à¤¾à¤° गरà¥à¤¨ 'apt --fix-broken install' à¤à¤²à¤¾à¤‰à¤¨ à¤à¤¾à¤¹à¤¨à¥à¤¹à¥à¤¨à¥à¤›:" + #~ msgid "(not found)" #~ msgstr "(फेला परेन)" @@ -6,14 +6,14 @@ # Wannes Soenen <wannes@wannes.cjb.net>, 2002. # Frans Pop <elendil@planet.nl>, 2010. # Jeroen Schot <schot@a-eskwadraat.nl>, 2011. -# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014, 2016. +# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014, 2016, 2017. # msgid "" msgstr "" -"Project-Id-Version: apt 1..3~rc4\n" +"Project-Id-Version: apt 1.4~beta4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-11-25 23:46+0100\n" -"PO-Revision-Date: 2016-09-16 10:56+0200\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\n" +"PO-Revision-Date: 2017-01-19 17:32+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" "Language: nl\n" @@ -433,16 +433,17 @@ msgstr "Kan de map %s niet vergrendelen" #, c-format msgid "No sandbox user '%s' on the system, can not drop privileges" msgstr "" -"Geen zandbakgebruiker '%s' op het systeem; kan voorrechten niet laten vallen" +"Geen sandboxgebruiker '%s' op het systeem; kan voorrechten niet laten vallen" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" -"Kan voorrechten voor het downloaden niet laten vallen, gezien bestand '%s' " -"niet door gebruiker '%s' kon benaderd worden." +"Het downloaden gebeurt door root (de systeembeheerder) en niet in een " +"sandbox (afgesloten ruimte), aangezien bestand '%s' niet door gebruiker '%s' " +"kon benaderd worden." #: apt-pkg/acquire.cc apt-pkg/clean.cc #, c-format @@ -1706,13 +1707,18 @@ msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren" msgid " Done" msgstr " Klaar" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "U kunt 'apt --fix-broken install' uitvoeren om dit op te lossen." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Er zijn niet-voldane vereisten. U kunt best 'apt --fix-broken install' " +"uitvoeren zonder pakketten op te geven, (of u kunt zelf een oplossing " +"specificeren)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1907,6 +1913,14 @@ msgid "Broken packages" msgstr "Niet-werkende pakketten" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Kon sommige archieven niet ophalen. Misschien kunt u 'apt-get update' " +"uitvoeren of het met '--fix-missing' proberen?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Interne fout. InstallPackages is aangeroepen met defecte pakketten!" @@ -2012,14 +2026,6 @@ msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Kon sommige archieven niet ophalen. Misschien kunt u 'apt-get update' " -"uitvoeren of het met '--fix-missing' proberen?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund" @@ -2094,20 +2100,6 @@ msgstr[0] "Gebruik '%s' om het te verwijderen." msgstr[1] "Gebruik '%s' om ze te verwijderen." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "" -"U wilt waarschijnlijk 'apt-get -f install' uitvoeren om de volgende zaken op " -"te lossen:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren " -"zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)." - -#: apt-private/private-install.cc msgid "The following additional packages will be installed:" msgstr "De volgende extra pakketten zullen geĂ¯nstalleerd worden:" @@ -2504,7 +2496,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Gelieve na te gaan of het pakket 'dpkg-dev' geĂ¯nstalleerd is.\n" @@ -3516,6 +3507,55 @@ msgstr " %s heeft geen voorrangsvermelding voor bronpakketten\n" msgid " %s has no binary override entry either\n" msgstr " %s heeft ook geen voorrangsvermelding voor binaire pakketten\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Wachten op de kopteksten" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "De HTTP-server verstuurde een ongeldige 'reply'-koptekst" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Foute koptekstregel" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "De HTTP-server verstuurde een ongeldige 'Content-Length'-koptekst" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "De HTTP-server verstuurde een ongeldige 'Content-Range'-koptekst" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Onbekend datumformaat" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Foute koptekstdata" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Verbinding mislukt" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" +"%s automatisch uitgeschakeld wegens fout antwoord van server/proxy. (man 5 " +"apt.conf)" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Interne fout" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3878,59 +3918,20 @@ msgstr "Instellen van de aanpassingstijd is mislukt" msgid "Connection closed prematurely" msgstr "Verbinding werd voortijdig afgebroken" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Wachten op de kopteksten" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "De HTTP-server verstuurde een ongeldige 'reply'-koptekst" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Foute koptekstregel" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "De HTTP-server verstuurde een ongeldige 'Content-Length'-koptekst" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "De HTTP-server verstuurde een ongeldige 'Content-Range'-koptekst" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Onbekend datumformaat" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Foute koptekstdata" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Verbinding mislukt" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" -"%s automatisch uitgeschakeld wegens fout antwoord van server/proxy. (man 5 " -"apt.conf)" - -#: methods/server.cc -msgid "Internal error" -msgstr "Interne fout" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "Lege bestanden kunnen geen geldige archieven zijn" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "" +#~ "Er zijn vereisten waaraan niet voldaan is. Probeer --fix-broken te " +#~ "gebruiken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "U wilt waarschijnlijk 'apt --fix-broken install' uitvoeren om de volgende " +#~ "zaken op te lossen:" + #~ msgid "Failed to fetch %s %s\n" #~ msgstr "Ophalen van %s is mislukt %s\n" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -413,8 +413,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1611,14 +1611,18 @@ msgstr "Klarte ikkje minimera oppgraderingsmengda" msgid " Done" msgstr " Ferdig" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "" -"Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»." +"Du vil kanskje prøva å retta på desse ved å køyra «apt --fix-broken install»." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Nokre krav er ikkje oppfylte. Prøv med «-f»." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Nokre krav er ikkje oppfylte. Du kan prøva «apt --fix-broken install» (eller " +"velja ei løysing)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1803,6 +1807,14 @@ msgid "Broken packages" msgstr "Øydelagde pakkar" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Klarte ikkje henta nokre av arkiva. Du kan prøva med «apt-get update» eller " +"«--fix-missing»." + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" @@ -1904,14 +1916,6 @@ msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Klarte ikkje henta nokre av arkiva. Du kan prøva med «apt-get update» eller " -"«--fix-missing»." - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "«--fix-missing» og byte av medium er ikkje støtta for tida" @@ -1978,19 +1982,6 @@ msgstr[0] "" msgstr[1] "" #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "" -"Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»." - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja " -"ei løysing)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Dei følgjande tilleggspakkane vil verta installerte:" @@ -2375,7 +2366,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislukkast.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" @@ -3343,6 +3333,53 @@ msgstr " %s har inga overstyringsoppføring\n" msgid " %s has no binary override entry either\n" msgstr " %s har inga overstyringsoppføring\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Ventar på hovud" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP-tenaren sende eit ugyldig svarhovud" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Øydelagd hovudlinje" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP-tenaren sende eit ugyldig «Content-Length»-hovud" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP-tenaren sende eit ugyldig «Content-Range»-hovud" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Denne HTTP-tenaren har øydelagd støtte for område" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Ukjend datoformat" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Øydelagde hovuddata" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Sambandet mislukkast" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Intern feil" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3695,57 +3732,18 @@ msgstr "Klarte ikkje setja endringstidspunkt" msgid "Connection closed prematurely" msgstr "Sambandet vart uventa stengd" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Ventar på hovud" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "HTTP-tenaren sende eit ugyldig svarhovud" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Øydelagd hovudlinje" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "HTTP-tenaren sende eit ugyldig «Content-Length»-hovud" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "HTTP-tenaren sende eit ugyldig «Content-Range»-hovud" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Denne HTTP-tenaren har øydelagd støtte for område" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Ukjend datoformat" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Øydelagde hovuddata" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Sambandet mislukkast" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Intern feil" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "Nokre krav er ikkje oppfylte. Prøv med «--fix-broken»." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "Du vil kanskje prøva å retta på desse ved å køyra «apt --fix-broken " +#~ "install»." + #~ msgid "(not found)" #~ msgstr "(ikkje funne)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -418,8 +418,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1672,13 +1672,17 @@ msgstr "Nie udaÅ‚o siÄ™ zminimalizować zbioru aktualizacji" msgid " Done" msgstr " Gotowe" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "Należy uruchomić \"apt --fix-broken install\", aby je naprawić." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "NiespeÅ‚nione zależnoÅ›ci. ProszÄ™ sprĂ³bować użyć -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"NiespeÅ‚nione zależnoÅ›ci. ProszÄ™ sprĂ³bować wykonać \"apt --fix-broken install" +"\" bez pakietĂ³w (lub podać rozwiÄ…zanie)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1864,6 +1868,14 @@ msgid "Broken packages" msgstr "Pakiety sÄ… uszkodzone" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Nie udaÅ‚o siÄ™ pobrać niektĂ³rych archiwĂ³w, proszÄ™ sprĂ³bować uruchomić apt-get " +"update lub użyć opcji --fix-missing." + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "BÅ‚Ä…d wewnÄ™trzny, użyto InstallPackages z uszkodzonymi pakietami!" @@ -1966,14 +1978,6 @@ msgid "Download complete and in download only mode" msgstr "UkoÅ„czono pobieranie w trybie samego pobierania" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Nie udaÅ‚o siÄ™ pobrać niektĂ³rych archiwĂ³w, proszÄ™ sprĂ³bować uruchomić apt-get " -"update lub użyć opcji --fix-missing." - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i zamiana noÅ›nikĂ³w nie sÄ… obecnie obsÅ‚ugiwane" @@ -2062,19 +2066,6 @@ msgstr[1] "Aby je usunąć należy użyć \"%s\"." msgstr[2] "Aby je usunąć należy użyć \"%s\"." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "" -"Należy uruchomić \"apt-get -f install\", aby naprawić poniższe problemy:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"NiespeÅ‚nione zależnoÅ›ci. ProszÄ™ sprĂ³bować wykonać \"apt-get -f install\" bez " -"pakietĂ³w (lub podać rozwiÄ…zanie)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "ZostanÄ… zainstalowane nastÄ™pujÄ…ce dodatkowe pakiety:" @@ -2476,7 +2467,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania \"%s\" zawiodÅ‚o.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ProszÄ™ sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n" @@ -3458,6 +3448,53 @@ msgstr " %s nie posiada wpisu w pliku override źrĂ³deÅ‚\n" msgid " %s has no binary override entry either\n" msgstr " %s nie posiada rĂ³wnież wpisu w pliku override binariĂ³w\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Oczekiwanie na nagÅ‚Ă³wki" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "Serwer HTTP przysÅ‚aÅ‚ nieprawidÅ‚owy nagÅ‚Ă³wek odpowiedzi" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "NieprawidÅ‚owa linia nagÅ‚Ă³wka" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "Serwer HTTP przysÅ‚aÅ‚ nieprawidÅ‚owy nagÅ‚Ă³wek Content-Length" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "Serwer HTTP przysÅ‚aÅ‚ nieprawidÅ‚owy nagÅ‚Ă³wek Content-Range" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Ten serwer HTTP nieprawidÅ‚owo obsÅ‚uguje zakresy (ranges)" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Nieznany format daty" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "BÅ‚Ä™dne dane nagÅ‚Ă³wka" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "PoÅ‚Ä…czenie nie powiodÅ‚o siÄ™" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "BÅ‚Ä…d wewnÄ™trzny" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3814,57 +3851,18 @@ msgstr "Nie udaÅ‚o siÄ™ ustawić czasu modyfikacji" msgid "Connection closed prematurely" msgstr "PoÅ‚Ä…czenie zostaÅ‚o przedwczeÅ›nie zamkniÄ™te" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Oczekiwanie na nagÅ‚Ă³wki" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "Serwer HTTP przysÅ‚aÅ‚ nieprawidÅ‚owy nagÅ‚Ă³wek odpowiedzi" - -#: methods/server.cc -msgid "Bad header line" -msgstr "NieprawidÅ‚owa linia nagÅ‚Ă³wka" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Serwer HTTP przysÅ‚aÅ‚ nieprawidÅ‚owy nagÅ‚Ă³wek Content-Length" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Serwer HTTP przysÅ‚aÅ‚ nieprawidÅ‚owy nagÅ‚Ă³wek Content-Range" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Ten serwer HTTP nieprawidÅ‚owo obsÅ‚uguje zakresy (ranges)" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Nieznany format daty" - -#: methods/server.cc -msgid "Bad header data" -msgstr "BÅ‚Ä™dne dane nagÅ‚Ă³wka" - -#: methods/server.cc -msgid "Connection failed" -msgstr "PoÅ‚Ä…czenie nie powiodÅ‚o siÄ™" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "BÅ‚Ä…d wewnÄ™trzny" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "Puste pliki nie mogÄ… być prawidÅ‚owymi archiwami" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "NiespeÅ‚nione zależnoÅ›ci. ProszÄ™ sprĂ³bować użyć --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "Należy uruchomić \"apt --fix-broken install\", aby naprawić poniższe " +#~ "problemy:" + #~ msgid "(not found)" #~ msgstr "(nie znaleziono)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -417,8 +417,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1676,13 +1676,18 @@ msgstr "NĂ£o foi possĂvel minimizar o conjunto de actualizações" msgid " Done" msgstr " Feito" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "VocĂª pode querer executar 'apt-get -f install' para corrigir isso." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "" +"VocĂª pode querer executar 'apt --fix-broken install' para corrigir isso." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "DependĂªncias nĂ£o satisfeitas. Tente utilizar -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"DependĂªncias nĂ£o satisfeitas. Tente 'apt --fix-broken install' sem nenhum " +"pacote (ou especifique uma soluĂ§Ă£o)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1868,6 +1873,14 @@ msgid "Broken packages" msgstr "Pacotes estragados" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"NĂ£o foi possĂvel obter alguns arquivos, tente talvez correr apt-get update " +"ou tente com --fix-missing?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!" @@ -1969,14 +1982,6 @@ msgid "Download complete and in download only mode" msgstr "Download completo e em modo de fazer apenas o download" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"NĂ£o foi possĂvel obter alguns arquivos, tente talvez correr apt-get update " -"ou tente com --fix-missing?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mĂdia nĂ£o sĂ£o suportados actualmente" @@ -2051,18 +2056,6 @@ msgstr[0] "Utilize '%s' para o remover." msgstr[1] "Utilize '%s' para os remover." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "VocĂª deve querer executar 'apt-get -f install' para corrigir estes:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"DependĂªncias nĂ£o satisfeitas. Tente 'apt-get -f install' sem nenhum pacote " -"(ou especifique uma soluĂ§Ă£o)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Os seguintes pacotes extra serĂ£o instalados:" @@ -2455,7 +2448,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactaĂ§Ă£o '%s' falhou.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verifique se o pacote 'dpkg-dev' estĂ¡ instalado.\n" @@ -3435,6 +3427,53 @@ msgstr " %s nĂ£o possui fonte de entrada de 'override'\n" msgid " %s has no binary override entry either\n" msgstr " %s tambĂ©m nĂ£o possui entrada binĂ¡ria de 'override'\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "A aguardar por cabeçalhos" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "O servidor HTTP enviou um cabeçalho de resposta invĂ¡lido" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Linha de cabeçalho errada" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "O servidor HTTP enviou um cabeçalho Content-Length invĂ¡lido" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "O servidor HTTP enviou um cabeçalho Content-Range invĂ¡lido" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Este servidor HTTP possui suporte de range errado" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Formato de data desconhecido" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Dados de cabeçalho errados" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "A ligaĂ§Ă£o falhou" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Erro interno" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3790,57 +3829,17 @@ msgstr "Falhou definir hora de modificaĂ§Ă£o" msgid "Connection closed prematurely" msgstr "LigaĂ§Ă£o encerrada prematuramente" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "A aguardar por cabeçalhos" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "O servidor HTTP enviou um cabeçalho de resposta invĂ¡lido" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Linha de cabeçalho errada" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "O servidor HTTP enviou um cabeçalho Content-Length invĂ¡lido" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "O servidor HTTP enviou um cabeçalho Content-Range invĂ¡lido" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Este servidor HTTP possui suporte de range errado" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Formato de data desconhecido" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Dados de cabeçalho errados" - -#: methods/server.cc -msgid "Connection failed" -msgstr "A ligaĂ§Ă£o falhou" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Erro interno" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "Ficheiros vazios nĂ£o podem ser arquivos vĂ¡lidos" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "DependĂªncias nĂ£o satisfeitas. Tente utilizar --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "VocĂª deve querer executar 'apt --fix-broken install' para corrigir estes:" + #~ msgid "(not found)" #~ msgstr "(nĂ£o encontrado)" @@ -4436,12 +4435,12 @@ msgstr "Ficheiros vazios nĂ£o podem ser arquivos vĂ¡lidos" #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies.\n" -#~ "You might want to run 'apt-get -f install' to correct these." +#~ "You might want to run 'apt --fix-broken install' to correct these." #~ msgstr "" #~ "Alguns pacotes quebrados foram encontrados enquanto se tentava " #~ "processar \n" #~ "as dependĂªncias de construĂ§Ă£o.\n" -#~ "VocĂª pode querer rodar 'apt-get -f install' para corrigĂ-los." +#~ "VocĂª pode querer rodar 'apt --fix-broken install' para corrigĂ-los." #~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs." #~ msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 068834598..7535b1eac 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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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." @@ -410,8 +410,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1619,13 +1619,17 @@ msgstr "ImpossĂvel minimizar o conjunto de atualizações" msgid " Done" msgstr " Pronto" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "VocĂª pode querer executar 'apt-get -f install' para corrigĂ-los." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "VocĂª pode querer executar 'apt --fix-broken install' para corrigĂ-los." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "DependĂªncias desencontradas. Tente usar -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"DependĂªncias desencontradas. Tente 'apt --fix-broken install' sem nenhum " +"pacote (ou especifique uma soluĂ§Ă£o)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1810,6 +1814,14 @@ msgid "Broken packages" msgstr "Pacotes quebrados" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"ImpossĂvel buscar alguns arquivos, talvez executar apt-get update ou tentar " +"com --fix-missing?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!" @@ -1912,14 +1924,6 @@ msgid "Download complete and in download only mode" msgstr "Baixar completo e no modo somente baixar (\"download only\")" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"ImpossĂvel buscar alguns arquivos, talvez executar apt-get update ou tentar " -"com --fix-missing?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mĂdia nĂ£o sĂ£o suportados atualmente" @@ -1995,18 +1999,6 @@ msgstr[0] "Use '%s' para removĂª-los." msgstr[1] "Use '%s' para removĂª-los." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "VocĂª deve querer executar 'apt-get -f install' para corrigĂ-los:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"DependĂªncias desencontradas. Tente 'apt-get -f install' sem nenhum pacote " -"(ou especifique uma soluĂ§Ă£o)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Os pacotes extra a seguir serĂ£o instalados:" @@ -2389,7 +2381,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Confira se o pacote 'dpkg-dev' estĂ¡ instalado.\n" @@ -3369,6 +3360,53 @@ msgstr " %s nĂ£o possui entrada override fonte\n" msgid " %s has no binary override entry either\n" msgstr " %s tambĂ©m nĂ£o possui entrada override binĂ¡ria\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Aguardando por cabeçalhos" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "O servidor HTTP enviou um cabeçalho de resposta invĂ¡lido" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Linha de cabeçalho ruim" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "O servidor HTTP enviou um cabeçalho \"Content-Length\" invĂ¡lido" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "O servidor HTTP enviou um cabeçalho \"Content-Range\" invĂ¡lido" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Este servidor HTTP possui suporte a \"range\" quebrado" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Formato de data desconhecido" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Dados de cabeçalho ruins" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "ConexĂ£o falhou" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Erro interno" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3725,57 +3763,17 @@ msgstr "Falhou ao definir hora de modificaĂ§Ă£o" msgid "Connection closed prematurely" msgstr "ConexĂ£o encerrada prematuramente" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Aguardando por cabeçalhos" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "O servidor HTTP enviou um cabeçalho de resposta invĂ¡lido" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Linha de cabeçalho ruim" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "O servidor HTTP enviou um cabeçalho \"Content-Length\" invĂ¡lido" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "O servidor HTTP enviou um cabeçalho \"Content-Range\" invĂ¡lido" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Este servidor HTTP possui suporte a \"range\" quebrado" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Formato de data desconhecido" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Dados de cabeçalho ruins" - -#: methods/server.cc -msgid "Connection failed" -msgstr "ConexĂ£o falhou" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Erro interno" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "DependĂªncias desencontradas. Tente usar --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "VocĂª deve querer executar 'apt --fix-broken install' para corrigĂ-los:" + #~ msgid "(not found)" #~ msgstr "(nĂ£o encontrado)" @@ -4263,12 +4261,12 @@ msgstr "" #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies.\n" -#~ "You might want to run 'apt-get -f install' to correct these." +#~ "You might want to run 'apt --fix-broken install' to correct these." #~ msgstr "" #~ "Alguns pacotes quebrados foram encontrados enquanto se tentava " #~ "processar \n" #~ "as dependĂªncias de construĂ§Ă£o.\n" -#~ "VocĂª pode querer rodar 'apt-get -f install' para corrigĂ-los." +#~ "VocĂª pode querer rodar 'apt --fix-broken install' para corrigĂ-los." #~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs." #~ msgstr "" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -413,8 +413,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1622,13 +1622,18 @@ msgstr "Nu s-a putut micÈ™ora mulÈ›imea pachetelor de Ă®nnoit" msgid " Done" msgstr " Terminat" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "AÈ›i putea să porniÈ›i 'apt-get -f install' pentru a corecta acestea." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "" +"AÈ›i putea să porniÈ›i 'apt --fix-broken install' pentru a corecta acestea." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "DependenÈ›e neĂ®ndeplinite. ĂncercaÈ›i să folosiÈ›i -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"DependenÈ›e neĂ®ndeplinite. ĂncercaÈ›i 'apt --fix-broken install' fără nici un " +"pachet (sau oferiÈ›i o altă soluÈ›ie)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1814,6 +1819,14 @@ msgid "Broken packages" msgstr "Pachete deteriorate" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Nu s-au putut aduce unele arhive, poate ar fi o idee bună să rulaÈ›i 'apt-get " +"update' sau Ă®ncercaÈ›i cu --fix-missing?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!" @@ -1915,14 +1928,6 @@ msgid "Download complete and in download only mode" msgstr "Descărcare completă È™i Ă®n modul doar descărcare" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Nu s-au putut aduce unele arhive, poate ar fi o idee bună să rulaÈ›i 'apt-get " -"update' sau Ă®ncercaÈ›i cu --fix-missing?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing È™i schimbul de mediu nu este deocamdată suportat" @@ -2002,18 +2007,6 @@ msgstr[1] "FolosiÈ›i '%s' pentru a le È™terge." msgstr[2] "FolosiÈ›i '%s' pentru a le È™terge." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "AÈ›i putea porni 'apt-get -f install' pentru a corecta acestea:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"DependenÈ›e neĂ®ndeplinite. ĂncercaÈ›i 'apt-get -f install' fără nici un pachet " -"(sau oferiÈ›i o altă soluÈ›ie)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" @@ -2396,7 +2389,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eÈ™uată.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "VerificaÈ›i dacă pachetul 'dpkg-dev' este instalat.\n" @@ -3377,6 +3369,53 @@ msgstr " %s nu are nici o intrare sursă de Ă®nlocuire\n" msgid " %s has no binary override entry either\n" msgstr " %s nu are nici intrare binară de Ă®nlocuire\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Ăn aÈ™teptarea antetelor" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "Serverul HTTP a trimis un antet de răspuns necorespunzător" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Linie de antet necorespunzătoare" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "Serverul HTTP a trimis un antet Content-Length necorespunzător" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "Serverul HTTP a trimis un antet zonă de conÈ›inut necorespunzător" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Acest server HTTP are un suport defect de intervale" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Format dată necunoscut" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Antet de date necorespunzător" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Conectare eÈ™uată" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Eroare internă" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3737,57 +3776,17 @@ msgstr "EÈ™ec la ajustarea timpului de modificare" msgid "Connection closed prematurely" msgstr "Conexiune Ă®nchisă prematur" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Ăn aÈ™teptarea antetelor" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "Serverul HTTP a trimis un antet de răspuns necorespunzător" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Linie de antet necorespunzătoare" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Serverul HTTP a trimis un antet Content-Length necorespunzător" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Serverul HTTP a trimis un antet zonă de conÈ›inut necorespunzător" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Acest server HTTP are un suport defect de intervale" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Format dată necunoscut" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Antet de date necorespunzător" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Conectare eÈ™uată" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Eroare internă" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "DependenÈ›e neĂ®ndeplinite. ĂncercaÈ›i să folosiÈ›i --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "AÈ›i putea porni 'apt --fix-broken install' pentru a corecta acestea:" + #~ msgid "(not found)" #~ msgstr "(negăsit)" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.2.12\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\n" "PO-Revision-Date: 2016-05-19 20:50+0300\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -431,10 +431,13 @@ msgstr "" "Đ’ ÑиÑÑ‚ĐµĐ¼Đµ Đ½Đµ Đ¿Đ¾Đ»ÑŒĐ·Đ¾Đ²Đ°Ñ‚ĐµĐ»Ñ Â«%s» Đ´Đ»Ñ Đ¿ĐµÑĐ¾Ñ‡Đ½Đ¸Ñ†Ñ‹, Đ½ĐµĐ²Đ¾Đ·Đ¼Đ¾Đ¶Đ½Đ¾ ÑĐ±Ñ€Đ¾ÑĐ¸Ñ‚ÑŒ Đ¿Ñ€Đ°Đ²Đ°" #: apt-pkg/acquire.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Can't drop privileges for downloading as file '%s' couldn't be accessed " +#| "by user '%s'." msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" "ĐĐµĐ²Đ¾Đ·Đ¼Đ¾Đ¶Đ½Đ¾ ÑĐ±Ñ€Đ¾ÑĐ¸Ñ‚ÑŒ Đ¿Ñ€Đ°Đ²Đ° Đ´Đ»Ñ ÑĐºĐ°Ñ‡Đ¸Đ²Đ°Đ½Đ¸Ñ, Ñ‚Đ°Đº ĐºĐ°Đº Ñ„Đ°Đ¹Đ» «%s» Đ½ĐµĐ´Đ¾ÑÑ‚ÑƒĐ¿ĐµĐ½ Đ´Đ»Ñ " "Đ¿Đ¾Đ»ÑŒĐ·Đ¾Đ²Đ°Ñ‚ĐµĐ»Ñ Â«%s»." @@ -1695,15 +1698,19 @@ msgstr "ĐĐµĐ²Đ¾Đ·Đ¼Đ¾Đ¶Đ½Đ¾ Đ¼Đ¸Đ½Đ¸Đ¼Đ¸Đ·Đ¸Ñ€Đ¾Đ²Đ°Ñ‚ÑŒ Đ½Đ°Đ±Đ¾Ñ€ Đ¾Đ±Đ½Đ¾Đ²Đ msgid " Done" msgstr " Đ“Đ¾Ñ‚Đ¾Đ²Đ¾" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "" "Đ’Đ¾Đ·Đ¼Đ¾Đ¶Đ½Đ¾, Đ´Đ»Ñ Đ¸ÑĐ¿Ñ€Đ°Đ²Đ»ĐµĐ½Đ¸Ñ ÑÑ‚Đ¸Ñ… Đ¾ÑˆĐ¸Đ±Đ¾Đº Đ²Ñ‹ Đ·Đ°Ñ…Đ¾Ñ‚Đ¸Ñ‚Đµ Đ²Đ¾ÑĐ¿Đ¾Đ»ÑŒĐ·Đ¾Đ²Đ°Ñ‚ÑŒÑÑ Â«apt-get -" "f install»." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "ĐĐµÑƒĐ´Đ¾Đ²Đ»ĐµÑ‚Đ²Đ¾Ñ€Ñ‘Đ½Đ½Ñ‹Đµ Đ·Đ°Đ²Đ¸ÑĐ¸Đ¼Đ¾ÑÑ‚Đ¸. ĐŸĐ¾Đ¿Ñ‹Ñ‚Đ°Đ¹Ñ‚ĐµÑÑŒ иÑĐ¿Đ¾Đ»ÑŒĐ·Đ¾Đ²Đ°Ñ‚ÑŒ -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"ĐĐµÑƒĐ´Đ¾Đ²Đ»ĐµÑ‚Đ²Đ¾Ñ€Ñ‘Đ½Đ½Ñ‹Đµ Đ·Đ°Đ²Đ¸ÑĐ¸Đ¼Đ¾ÑÑ‚Đ¸. ĐŸĐ¾Đ¿Ñ‹Ñ‚Đ°Đ¹Ñ‚ĐµÑÑŒ Đ²Ñ‹Đ¿Đ¾Đ»Đ½Đ¸Ñ‚ÑŒ «apt --fix-broken " +"install», Đ½Đµ ÑƒĐºĐ°Đ·Ñ‹Đ²Đ°Ñ Đ¸Đ¼ĐµĐ½Đ¸ Đ¿Đ°ĐºĐµÑ‚Đ°, (или Đ½Đ°Đ¹Đ´Đ¸Ñ‚Đµ Đ´Ñ€ÑƒĐ³Đ¾Đµ Ñ€ĐµÑˆĐµĐ½Đ¸Đµ)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1894,6 +1901,14 @@ msgid "Broken packages" msgstr "Đ¡Đ»Đ¾Đ¼Đ°Đ½Đ½Ñ‹Đµ Đ¿Đ°ĐºĐµÑ‚Ñ‹" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"ĐĐµĐ²Đ¾Đ·Đ¼Đ¾Đ¶Đ½Đ¾ Đ¿Đ¾Đ»ÑƒÑ‡Đ¸Ñ‚ÑŒ Đ½ĐµĐºĐ¾Ñ‚Đ¾Ñ€Ñ‹Đµ Đ°Ñ€Ñ…Đ¸Đ²Ñ‹, Đ²ĐµÑ€Đ¾ÑÑ‚Đ½Đ¾ Đ½Đ°Đ´Đ¾ Đ·Đ°Đ¿ÑƒÑÑ‚Đ¸Ñ‚ÑŒ apt-get update " +"или Đ¿Đ¾Đ¿Ñ‹Ñ‚Đ°Ñ‚ÑŒÑÑ Đ¿Đ¾Đ²Ñ‚Đ¾Ñ€Đ¸Ñ‚ÑŒ Đ·Đ°Đ¿ÑƒÑĐº Ñ ĐºĐ»ÑÑ‡Đ¾Đ¼ --fix-missing" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Đ’Đ½ÑƒÑ‚Ñ€ĐµĐ½Đ½ÑÑ Đ¾ÑˆĐ¸Đ±ĐºĐ°, InstallPackages Đ±Ñ‹Đ»Đ° Đ²Ñ‹Đ·Đ²Đ°Đ½Đ° Ñ Đ½ĐµÑ€Đ°Đ±Đ¾Ñ‚Đ¾ÑĐ¿Đ¾ÑĐ¾Đ±Đ½Ñ‹Đ¼Đ¸ " @@ -2005,14 +2020,6 @@ msgid "Download complete and in download only mode" msgstr "Đ£ĐºĐ°Đ·Đ°Đ½ Ñ€ĐµĐ¶Đ¸Đ¼ Â«Ñ‚Đ¾Đ»ÑŒĐºĐ¾ ÑĐºĐ°Ñ‡Đ¸Đ²Đ°Đ½Đ¸ĐµÂ», и ÑĐºĐ°Ñ‡Đ¸Đ²Đ°Đ½Đ¸Đµ Đ·Đ°Đ²ĐµÑ€ÑˆĐµĐ½Đ¾" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"ĐĐµĐ²Đ¾Đ·Đ¼Đ¾Đ¶Đ½Đ¾ Đ¿Đ¾Đ»ÑƒÑ‡Đ¸Ñ‚ÑŒ Đ½ĐµĐºĐ¾Ñ‚Đ¾Ñ€Ñ‹Đµ Đ°Ñ€Ñ…Đ¸Đ²Ñ‹, Đ²ĐµÑ€Đ¾ÑÑ‚Đ½Đ¾ Đ½Đ°Đ´Đ¾ Đ·Đ°Đ¿ÑƒÑÑ‚Đ¸Ñ‚ÑŒ apt-get update " -"или Đ¿Đ¾Đ¿Ñ‹Ñ‚Đ°Ñ‚ÑŒÑÑ Đ¿Đ¾Đ²Ñ‚Đ¾Ñ€Đ¸Ñ‚ÑŒ Đ·Đ°Đ¿ÑƒÑĐº Ñ ĐºĐ»ÑÑ‡Đ¾Đ¼ --fix-missing" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing и ÑĐ¼ĐµĐ½Đ° Đ½Đ¾ÑĐ¸Ñ‚ĐµĐ»Ñ Đ² Đ´Đ°Đ½Đ½Ñ‹Đ¹ Đ¼Đ¾Đ¼ĐµĐ½Ñ‚ Đ½Đµ Đ¿Đ¾Đ´Đ´ĐµÑ€Đ¶Đ¸Đ²Đ°ÑÑ‚ÑÑ" @@ -2091,20 +2098,6 @@ msgstr[1] "Đ”Đ»Ñ Đ¸Ñ… ÑƒĐ´Đ°Đ»ĐµĐ½Đ¸Ñ Đ¸ÑĐ¿Đ¾Đ»ÑŒĐ·ÑƒĐ¹Ñ‚Đµ «%s»." msgstr[2] "Đ”Đ»Ñ Đ¸Ñ… ÑƒĐ´Đ°Đ»ĐµĐ½Đ¸Ñ Đ¸ÑĐ¿Đ¾Đ»ÑŒĐ·ÑƒĐ¹Ñ‚Đµ «%s»." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "" -"Đ’Đ¾Đ·Đ¼Đ¾Đ¶Đ½Đ¾, Đ´Đ»Ñ Đ¸ÑĐ¿Ñ€Đ°Đ²Đ»ĐµĐ½Đ¸Ñ ÑÑ‚Đ¸Ñ… Đ¾ÑˆĐ¸Đ±Đ¾Đº Đ²Ñ‹ Đ·Đ°Ñ…Đ¾Ñ‚Đ¸Ñ‚Đµ Đ²Đ¾ÑĐ¿Đ¾Đ»ÑŒĐ·Đ¾Đ²Đ°Ñ‚ÑŒÑÑ Â«apt-get -" -"f install»:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"ĐĐµÑƒĐ´Đ¾Đ²Đ»ĐµÑ‚Đ²Đ¾Ñ€Ñ‘Đ½Đ½Ñ‹Đµ Đ·Đ°Đ²Đ¸ÑĐ¸Đ¼Đ¾ÑÑ‚Đ¸. ĐŸĐ¾Đ¿Ñ‹Ñ‚Đ°Đ¹Ñ‚ĐµÑÑŒ Đ²Ñ‹Đ¿Đ¾Đ»Đ½Đ¸Ñ‚ÑŒ «apt-get -f install», " -"Đ½Đµ ÑƒĐºĐ°Đ·Ñ‹Đ²Đ°Ñ Đ¸Đ¼ĐµĐ½Đ¸ Đ¿Đ°ĐºĐµÑ‚Đ°, (или Đ½Đ°Đ¹Đ´Đ¸Ñ‚Đµ Đ´Ñ€ÑƒĐ³Đ¾Đµ Ñ€ĐµÑˆĐµĐ½Đ¸Đµ)." - -#: apt-private/private-install.cc msgid "The following additional packages will be installed:" msgstr "Đ‘ÑƒĐ´ÑƒÑ‚ уÑÑ‚Đ°Đ½Đ¾Đ²Đ»ĐµĐ½Ñ‹ ÑĐ»ĐµĐ´ÑƒÑÑ‰Đ¸Đµ Đ´Đ¾Đ¿Đ¾Đ»Đ½Đ¸Ñ‚ĐµĐ»ÑŒĐ½Ñ‹Đµ Đ¿Đ°ĐºĐµÑ‚Ñ‹:" @@ -2493,7 +2486,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "ĐĐ¾Đ¼Đ°Đ½Đ´Đ° Ñ€Đ°ÑĐ¿Đ°ĐºĐ¾Đ²ĐºĐ¸ «%s» Đ·Đ°Đ²ĐµÑ€ÑˆĐ¸Đ»Đ°ÑÑŒ Đ½ĐµÑƒĐ´Đ°Ñ‡Đ½Đ¾.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ĐŸÑ€Đ¾Đ²ĐµÑ€ÑŒÑ‚Đµ, уÑÑ‚Đ°Đ½Đ¾Đ²Đ»ĐµĐ½ ли Đ¿Đ°ĐºĐµÑ‚ «dpkg-dev».\n" @@ -3493,6 +3485,55 @@ msgstr " ĐĐµÑ‚ Đ·Đ°Đ¿Đ¸Ñи source override Đ´Đ»Ñ %s\n" msgid " %s has no binary override entry either\n" msgstr " ĐĐµÑ‚ Đ·Đ°Đ¿Đ¸Ñи binary override Đ´Đ»Ñ %s\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "ĐĐ¶Đ¸Đ´Đ°Đ½Đ¸Đµ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²ĐºĐ¾Đ²" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "Http-ÑĐµÑ€Đ²ĐµÑ€ Đ¿Đ¾Ñлал Đ½ĐµĐ²ĐµÑ€Đ½Ñ‹Đ¹ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²Đ¾Đº" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "ĐĐµĐ²ĐµÑ€Đ½Ñ‹Đ¹ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²Đ¾Đº" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "Http ÑĐµÑ€Đ²ĐµÑ€ Đ¿Đ¾Ñлал Đ½ĐµĐ²ĐµÑ€Đ½Ñ‹Đ¹ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²Đ¾Đº Content-Length" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "Http-ÑĐµÑ€Đ²ĐµÑ€ Đ¿Đ¾Ñлал Đ½ĐµĐ²ĐµÑ€Đ½Ñ‹Đ¹ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²Đ¾Đº Content-Range" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "ĐÑ‚Đ¾Ñ‚ HTTP-ÑĐµÑ€Đ²ĐµÑ€ Đ½Đµ Đ¿Đ¾Đ´Đ´ĐµÑ€Đ¶Đ¸Đ²Đ°ĐµÑ‚ ÑĐºĐ°Ñ‡Đ¸Đ²Đ°Đ½Đ¸Đµ Ñ„Ñ€Đ°Đ³Đ¼ĐµĐ½Ñ‚Đ¾Đ² Ñ„Đ°Đ¹Đ»Đ¾Đ²" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "ĐĐµĐ¸Đ·Đ²ĐµÑÑ‚Đ½Ñ‹Đ¹ Ñ„Đ¾Ñ€Đ¼Đ°Ñ‚ Đ´Đ°Đ½Đ½Ñ‹Ñ…" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "ĐĐµĐ²ĐµÑ€Đ½Ñ‹Đ¹ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²Đ¾Đº Đ´Đ°Đ½Đ½Ñ‹Ñ…" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Đ¡Đ¾ĐµĐ´Đ¸Đ½ĐµĐ½Đ¸Đµ Ñ€Đ°Đ·Đ¾Ñ€Đ²Đ°Đ½Đ¾" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" +"ĐĐ²Ñ‚Đ¾Đ¼Đ°Ñ‚Đ¸Ñ‡ĐµÑĐºĐ¾Đµ Đ¾Ñ‚ĐºĐ»ÑÑ‡ĐµĐ½Đ¸Đµ %s из-Đ·Đ° Đ½ĐµĐºĐ¾Ñ€Ñ€ĐµĐºÑ‚Đ½Đ¾Đ³Đ¾ Đ¾Ñ‚Đ²ĐµÑ‚Đ° ÑĐµÑ€Đ²ĐµÑ€Đ°/Đ¿Ñ€Đ¾ĐºÑи (man " +"5 apt.conf)." + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Đ’Đ½ÑƒÑ‚Ñ€ĐµĐ½Đ½ÑÑ Đ¾ÑˆĐ¸Đ±ĐºĐ°" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3853,59 +3894,19 @@ msgstr "Đе ÑƒĐ´Đ°Đ»Đ¾ÑÑŒ уÑÑ‚Đ°Đ½Đ¾Đ²Đ¸Ñ‚ÑŒ Đ²Ñ€ĐµĐ¼Ñ Đ¼Đ¾Đ´Đ¸Ñ„Đ¸ĐºĐ°Ñ†Đ¸ msgid "Connection closed prematurely" msgstr "Đ¡Đ¾ĐµĐ´Đ¸Đ½ĐµĐ½Đ¸Đµ Đ·Đ°ĐºÑ€Ñ‹Ñ‚Đ¾ Đ¿Ñ€ĐµĐ¶Đ´ĐµĐ²Ñ€ĐµĐ¼ĐµĐ½Đ½Đ¾" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "ĐĐ¶Đ¸Đ´Đ°Đ½Đ¸Đµ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²ĐºĐ¾Đ²" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "Http-ÑĐµÑ€Đ²ĐµÑ€ Đ¿Đ¾Ñлал Đ½ĐµĐ²ĐµÑ€Đ½Ñ‹Đ¹ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²Đ¾Đº" - -#: methods/server.cc -msgid "Bad header line" -msgstr "ĐĐµĐ²ĐµÑ€Đ½Ñ‹Đ¹ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²Đ¾Đº" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Http ÑĐµÑ€Đ²ĐµÑ€ Đ¿Đ¾Ñлал Đ½ĐµĐ²ĐµÑ€Đ½Ñ‹Đ¹ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²Đ¾Đº Content-Length" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Http-ÑĐµÑ€Đ²ĐµÑ€ Đ¿Đ¾Ñлал Đ½ĐµĐ²ĐµÑ€Đ½Ñ‹Đ¹ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²Đ¾Đº Content-Range" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "ĐÑ‚Đ¾Ñ‚ HTTP-ÑĐµÑ€Đ²ĐµÑ€ Đ½Đµ Đ¿Đ¾Đ´Đ´ĐµÑ€Đ¶Đ¸Đ²Đ°ĐµÑ‚ ÑĐºĐ°Ñ‡Đ¸Đ²Đ°Đ½Đ¸Đµ Ñ„Ñ€Đ°Đ³Đ¼ĐµĐ½Ñ‚Đ¾Đ² Ñ„Đ°Đ¹Đ»Đ¾Đ²" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "ĐĐµĐ¸Đ·Đ²ĐµÑÑ‚Đ½Ñ‹Đ¹ Ñ„Đ¾Ñ€Đ¼Đ°Ñ‚ Đ´Đ°Đ½Đ½Ñ‹Ñ…" - -#: methods/server.cc -msgid "Bad header data" -msgstr "ĐĐµĐ²ĐµÑ€Đ½Ñ‹Đ¹ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²Đ¾Đº Đ´Đ°Đ½Đ½Ñ‹Ñ…" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Đ¡Đ¾ĐµĐ´Đ¸Đ½ĐµĐ½Đ¸Đµ Ñ€Đ°Đ·Đ¾Ñ€Đ²Đ°Đ½Đ¾" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" -"ĐĐ²Ñ‚Đ¾Đ¼Đ°Ñ‚Đ¸Ñ‡ĐµÑĐºĐ¾Đµ Đ¾Ñ‚ĐºĐ»ÑÑ‡ĐµĐ½Đ¸Đµ %s из-Đ·Đ° Đ½ĐµĐºĐ¾Ñ€Ñ€ĐµĐºÑ‚Đ½Đ¾Đ³Đ¾ Đ¾Ñ‚Đ²ĐµÑ‚Đ° ÑĐµÑ€Đ²ĐµÑ€Đ°/Đ¿Ñ€Đ¾ĐºÑи (man " -"5 apt.conf)." - -#: methods/server.cc -msgid "Internal error" -msgstr "Đ’Đ½ÑƒÑ‚Ñ€ĐµĐ½Đ½ÑÑ Đ¾ÑˆĐ¸Đ±ĐºĐ°" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "ĐŸÑƒÑÑ‚Ñ‹Đµ Ñ„Đ°Đ¹Đ»Ñ‹ Đ½Đµ Đ¼Đ¾Đ³ÑƒÑ‚ Đ±Ñ‹Ñ‚ÑŒ Đ´Đ¾Đ¿ÑƒÑÑ‚Đ¸Đ¼Ñ‹Đ¼Đ¸ Đ°Ñ€Ñ…Đ¸Đ²Đ°Đ¼Đ¸" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "" +#~ "ĐĐµÑƒĐ´Đ¾Đ²Đ»ĐµÑ‚Đ²Đ¾Ñ€Ñ‘Đ½Đ½Ñ‹Đµ Đ·Đ°Đ²Đ¸ÑĐ¸Đ¼Đ¾ÑÑ‚Đ¸. ĐŸĐ¾Đ¿Ñ‹Ñ‚Đ°Đ¹Ñ‚ĐµÑÑŒ иÑĐ¿Đ¾Đ»ÑŒĐ·Đ¾Đ²Đ°Ñ‚ÑŒ --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "Đ’Đ¾Đ·Đ¼Đ¾Đ¶Đ½Đ¾, Đ´Đ»Ñ Đ¸ÑĐ¿Ñ€Đ°Đ²Đ»ĐµĐ½Đ¸Ñ ÑÑ‚Đ¸Ñ… Đ¾ÑˆĐ¸Đ±Đ¾Đº Đ²Ñ‹ Đ·Đ°Ñ…Đ¾Ñ‚Đ¸Ñ‚Đµ Đ²Đ¾ÑĐ¿Đ¾Đ»ÑŒĐ·Đ¾Đ²Đ°Ñ‚ÑŒÑÑ Â«apt-" +#~ "get -f install»:" + #~ msgid "(not found)" #~ msgstr "(Đ½Đµ Đ½Đ°Đ¹Đ´ĐµĐ½Đ¾)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -414,8 +414,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1642,13 +1642,17 @@ msgstr "Sada na aktualizĂ¡ciu sa nedĂ¡ minimalizovaÅ¥" msgid " Done" msgstr " Hotovo" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Možno to budete chcieÅ¥ napraviÅ¥ spustenĂm â€apt-get -f install“." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "Možno to budete chcieÅ¥ napraviÅ¥ spustenĂm â€apt --fix-broken install“." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "NesplnenĂ© zĂ¡vislosti. SkĂºste použiÅ¥ -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"NesplnenĂ© zĂ¡vislosti. SkĂºste spustiÅ¥ â€apt --fix-broken install“ bez balĂkov " +"(alebo navrhnite rieÅ¡enie)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1833,6 +1837,14 @@ msgid "Broken packages" msgstr "PoÅ¡kodenĂ© balĂky" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"NiektorĂ© archĂvy sa nedajĂº stiahnuÅ¥. SkĂºste spustiÅ¥ apt-get update alebo --" +"fix-missing" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "VnĂºtornĂ¡ chyba, InstallPackages bolo volanĂ© s poÅ¡kodenĂ½mi balĂkmi!" @@ -1934,14 +1946,6 @@ msgid "Download complete and in download only mode" msgstr "SÅ¥ahovanie ukonÄenĂ© v režime â€iba stiahnuť“" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"NiektorĂ© archĂvy sa nedajĂº stiahnuÅ¥. SkĂºste spustiÅ¥ apt-get update alebo --" -"fix-missing" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a vĂ½mena nosiÄa nie sĂº momentĂ¡lne podporovanĂ©" @@ -2024,18 +2028,6 @@ msgstr[1] "Na ich odstrĂ¡nenie použite â€%s“." msgstr[2] "Na ich odstrĂ¡nenie použite â€%s“." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Možno to budete chcieÅ¥ napraviÅ¥ spustenĂm â€apt-get -f install“:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"NesplnenĂ© zĂ¡vislosti. SkĂºste spustiÅ¥ â€apt-get -f install“ bez balĂkov (alebo " -"navrhnite rieÅ¡enie)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "NainÅ¡talujĂº sa nasledovnĂ© extra balĂky:" @@ -2428,7 +2420,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "PrĂkaz na rozbalenie â€%s“ zlyhal.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Skontrolujte, Äi je nainÅ¡talovanĂ½ balĂk â€dpkg-dev“.\n" @@ -3400,6 +3391,53 @@ msgstr " %s nemĂ¡ žiadnu položku â€source override“\n" msgid " %s has no binary override entry either\n" msgstr " %s nemĂ¡ žiadnu položku â€binary override“\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "ÄŒakĂ¡ sa na hlaviÄky" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP server poslal neplatnĂº hlaviÄku odpovede" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "ChybnĂ¡ hlaviÄka" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP server poslal neplatnĂº hlaviÄku Content-Length" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP server poslal neplatnĂº hlaviÄku Content-Range" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Tento HTTP server mĂ¡ poÅ¡kodenĂº podporu rozsahov" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "NeznĂ¡my formĂ¡t dĂ¡tumu" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "ZlĂ© dĂ¡tovĂ© zĂ¡hlavie" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Spojenie zlyhalo" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "VnĂºtornĂ¡ chyba" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3752,57 +3790,17 @@ msgstr "Zlyhalo nastavenie Äasu zmeny" msgid "Connection closed prematurely" msgstr "Spojenie bolo predÄasne ukonÄenĂ©" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "ÄŒakĂ¡ sa na hlaviÄky" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "HTTP server poslal neplatnĂº hlaviÄku odpovede" - -#: methods/server.cc -msgid "Bad header line" -msgstr "ChybnĂ¡ hlaviÄka" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "HTTP server poslal neplatnĂº hlaviÄku Content-Length" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "HTTP server poslal neplatnĂº hlaviÄku Content-Range" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Tento HTTP server mĂ¡ poÅ¡kodenĂº podporu rozsahov" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "NeznĂ¡my formĂ¡t dĂ¡tumu" - -#: methods/server.cc -msgid "Bad header data" -msgstr "ZlĂ© dĂ¡tovĂ© zĂ¡hlavie" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Spojenie zlyhalo" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "VnĂºtornĂ¡ chyba" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "PrĂ¡zdne sĂºbory nemĂ´Å¾u byÅ¥ platnĂ© archĂvy" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "NesplnenĂ© zĂ¡vislosti. SkĂºste použiÅ¥ --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "Možno to budete chcieÅ¥ napraviÅ¥ spustenĂm â€apt --fix-broken install“:" + #~ msgid "(not found)" #~ msgstr "(nenĂ¡jdenĂ©)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -416,8 +416,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1642,13 +1642,18 @@ msgstr "Ni mogoÄe pomanjÅ¡ati zbirke za nadgradnjo" msgid " Done" msgstr " Opravljeno" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "ÄŒe želite popraviti napake, poskusite pognati 'apt-get -f install'." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "" +"ÄŒe želite popraviti napake, poskusite pognati 'apt --fix-broken install'." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "NereÅ¡ene odvisnosti. Poskusite uporabiti -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"NereÅ¡ene odvisnosti. Poskusite 'apt --fix-broken install' brez paketov (ali " +"navedite reÅ¡itev)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1833,6 +1838,14 @@ msgid "Broken packages" msgstr "Pokvarjeni paketi" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Nekaterih arhivov ni mogoÄe dobiti. Poskusite uporabiti apt-get update ali --" +"fix-missing." + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!" @@ -1934,14 +1947,6 @@ msgid "Download complete and in download only mode" msgstr "Prejem je dokonÄan in uporabljen je naÄin samo prejema" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Nekaterih arhivov ni mogoÄe dobiti. Poskusite uporabiti apt-get update ali --" -"fix-missing." - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing in izmenjava medija trenutno nista podprta" @@ -2028,18 +2033,6 @@ msgstr[2] "Uporabite '%s' za njuno odstranitev." msgstr[3] "Uporabite '%s' za njihovo odstranitev." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Poskusite zagnati 'apt-get -f install', Äe želite popraviti naslednje:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"NereÅ¡ene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " -"navedite reÅ¡itev)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Naslednji dodatni paketi bodo nameÅ¡Äeni:" @@ -2432,7 +2425,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Izberite, Äe je paket 'dpkg-dev' nameÅ¡Äen.\n" @@ -3406,6 +3398,53 @@ msgstr " %s nima izvornega vnosa prepisa\n" msgid " %s has no binary override entry either\n" msgstr " %s nima tudi binarnega vnosa prepisa\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "ÄŒakanje na glave" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "Strežnik HTTP je poslal neveljavno glavo odgovora" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Neveljavna vrstica glave" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "Strežnik HTTP je poslal glavo z neveljavno dolžino vsebine" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "Strežnik HTTP je poslal glavo z neveljavnim obsegom vsebine" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Ta strežnik HTTP ima pokvarjen obseg podpore" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Neznana oblika datuma" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "NapaÄni podatki glave" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Povezava ni uspela" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Notranja napaka" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3758,57 +3797,18 @@ msgstr "Nastavitev Äasa spremembe je spodletela" msgid "Connection closed prematurely" msgstr "Povezava se je prezgodaj zaprla" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "ÄŒakanje na glave" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "Strežnik HTTP je poslal neveljavno glavo odgovora" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Neveljavna vrstica glave" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Strežnik HTTP je poslal glavo z neveljavno dolžino vsebine" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Strežnik HTTP je poslal glavo z neveljavnim obsegom vsebine" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Ta strežnik HTTP ima pokvarjen obseg podpore" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Neznana oblika datuma" - -#: methods/server.cc -msgid "Bad header data" -msgstr "NapaÄni podatki glave" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Povezava ni uspela" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Notranja napaka" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "Prazne datoteke ne morejo biti veljavni arhivi" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "NereÅ¡ene odvisnosti. Poskusite uporabiti --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "Poskusite zagnati 'apt --fix-broken install', Äe želite popraviti " +#~ "naslednje:" + #~ msgid "(not found)" #~ msgstr "(ni najdeno)" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -416,10 +416,13 @@ msgid "No sandbox user '%s' on the system, can not drop privileges" msgstr "" #: apt-pkg/acquire.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Can't drop privileges for downloading as file '%s' couldn't be accessed " +#| "by user '%s'." msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" "Kan inte släppa privilegier för hämtning eftersom filen â€%s†inte kunde " "kommas Ă¥t av användaren â€%sâ€." @@ -1661,13 +1664,17 @@ msgstr "Kunde inte minimera uppgraderingsuppsättningen" msgid " Done" msgstr " Färdig" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Du bör köra â€apt-get -f install†för att korrigera dessa." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "Du bör köra â€apt --fix-broken install†för att korrigera dessa." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Otillfredsställda beroenden. Prova med -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Otillfredsställda beroenden. Prova med â€apt --fix-broken install†utan paket " +"(eller ange en lösning)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1852,6 +1859,14 @@ msgid "Broken packages" msgstr "Trasiga paket" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Vissa arkiv kunde inte hämtas. Prova att köra â€apt-get update†eller med --" +"fix-missing." + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Internt fel. InstallPackages anropades med trasiga paket!" @@ -1956,14 +1971,6 @@ msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i â€endast-hämtaâ€-läge" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Vissa arkiv kunde inte hämtas. Prova att köra â€apt-get update†eller med --" -"fix-missing." - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing och mediabyte stöds inte för tillfället" @@ -2039,18 +2046,6 @@ msgstr[0] "Använd â€%s†för att ta bort det." msgstr[1] "Använd â€%s†för att ta bort dem." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Du bör köra â€apt-get -f install†för att korrigera dessa:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Otillfredsställda beroenden. Prova med â€apt-get -f install†utan paket " -"(eller ange en lösning)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Följande ytterligare paket kommer att installeras:" @@ -2443,7 +2438,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot â€%s†misslyckades.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Försäkra dig om att paketet â€dpkg-dev†är installerat.\n" @@ -3427,6 +3421,55 @@ msgstr " %s har ingen källĂ¥sidosättningspost\n" msgid " %s has no binary override entry either\n" msgstr " %s har heller ingen binär Ă¥sidosättningspost\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Väntar pĂ¥ rubriker" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "Http-servern sände ett ogiltigt svarshuvud" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Felaktig rubrikrad" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "Http-servern sände en ogiltig Content-Length-rubrik" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "Http-servern sände en ogiltig Content-Range-rubrik" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Okänt datumformat" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Felaktiga data i huvud" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Anslutningen misslyckades" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" +"Inaktiverade automatiskt %s pĂ¥ grund av felaktigt svar frĂ¥n server/proxy. " +"(man 5 apt.conf)" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Internt fel" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3787,59 +3830,16 @@ msgstr "Misslyckades med att ställa in ändringstid" msgid "Connection closed prematurely" msgstr "Anslutningen stängdes i förtid" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Väntar pĂ¥ rubriker" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "Http-servern sände ett ogiltigt svarshuvud" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Felaktig rubrikrad" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Http-servern sände en ogiltig Content-Length-rubrik" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Http-servern sände en ogiltig Content-Range-rubrik" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Okänt datumformat" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Felaktiga data i huvud" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Anslutningen misslyckades" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" -"Inaktiverade automatiskt %s pĂ¥ grund av felaktigt svar frĂ¥n server/proxy. " -"(man 5 apt.conf)" - -#: methods/server.cc -msgid "Internal error" -msgstr "Internt fel" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "Tomma filer kan inte vara giltiga arkiv" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "Otillfredsställda beroenden. Prova med --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "Du bör köra â€apt --fix-broken install†för att korrigera dessa:" + #~ msgid "(not found)" #~ msgstr "(hittades inte)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -411,8 +411,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1613,13 +1613,17 @@ msgstr "ไม่สามารถจำà¸à¸±à¸”รายà¸à¸²à¸£à¸›à¸£à¸±à¸ msgid " Done" msgstr " เสร็จà¹à¸¥à¹‰à¸§" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "คุณà¸à¸²à¸ˆà¸•à¹‰à¸à¸‡à¹€à¸£à¸µà¸¢à¸ 'apt-get -f install' เà¸à¸·à¹ˆà¸à¹à¸à¹‰à¸›à¸±à¸à¸«à¸²à¹€à¸«à¸¥à¹ˆà¸²à¸™à¸µà¹‰" +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "คุณà¸à¸²à¸ˆà¸•à¹‰à¸à¸‡à¹€à¸£à¸µà¸¢à¸ 'apt --fix-broken install' เà¸à¸·à¹ˆà¸à¹à¸à¹‰à¸›à¸±à¸à¸«à¸²à¹€à¸«à¸¥à¹ˆà¸²à¸™à¸µà¹‰" -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "รายà¸à¸²à¸£à¹à¸à¸à¹€à¸à¸ˆà¸—ี่ต้à¸à¸‡à¹ƒà¸à¹‰à¹„ม่ครภà¸à¸£à¸¸à¸“าลà¸à¸‡à¹ƒà¸à¹‰à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸ -f" +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"มีปัà¸à¸«à¸²à¸„วามขึ้นต่à¸à¸à¸±à¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¹à¸à¸à¹€à¸à¸ˆ à¸à¸£à¸¸à¸“าลà¸à¸‡à¹ƒà¸à¹‰ 'apt --fix-broken install' " +"โดยไม่ระà¸à¸¸à¹à¸à¸à¹€à¸à¸ˆ (หรืà¸à¸ˆà¸°à¸£à¸°à¸à¸¸à¸—างà¹à¸à¹‰à¸à¹‡à¹„ด้)" #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1801,6 +1805,14 @@ msgid "Broken packages" msgstr "à¹à¸à¸à¹€à¸à¸ˆà¸¡à¸µà¸›à¸±à¸à¸«à¸²" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"ดาวน์โหลดà¸à¸²à¸‡à¹à¸à¸à¹€à¸à¸ˆà¹„ม่สำเร็จ à¸à¸²à¸‡à¸—ี à¸à¸²à¸£à¹€à¸£à¸µà¸¢à¸ apt-get update หรืà¸à¸¥à¸à¸‡à¹ƒà¸à¹‰à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸ --fix-" +"missing à¸à¸²à¸ˆà¸à¹ˆà¸§à¸¢à¹„ด้" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”à¸à¸¥à¸²à¸”ภายใน: มีà¸à¸²à¸£à¹€à¸£à¸µà¸¢à¸ InstallPackages ด้วยà¹à¸à¸à¹€à¸à¸ˆà¸—ี่เสีย!" @@ -1900,14 +1912,6 @@ msgid "Download complete and in download only mode" msgstr "ดาวน์โหลดสำเร็จà¹à¸¥à¹‰à¸§ à¹à¸¥à¸°à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¹‚หมดดาวน์โหลดà¸à¸¢à¹ˆà¸²à¸‡à¹€à¸”ียว" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"ดาวน์โหลดà¸à¸²à¸‡à¹à¸à¸à¹€à¸à¸ˆà¹„ม่สำเร็จ à¸à¸²à¸‡à¸—ี à¸à¸²à¸£à¹€à¸£à¸µà¸¢à¸ apt-get update หรืà¸à¸¥à¸à¸‡à¹ƒà¸à¹‰à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸ --fix-" -"missing à¸à¸²à¸ˆà¸à¹ˆà¸§à¸¢à¹„ด้" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "ยังไม่รà¸à¸‡à¸£à¸±à¸ --fix-missing à¸à¸£à¹‰à¸à¸¡à¸à¸±à¸à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸œà¹ˆà¸™" @@ -1972,18 +1976,6 @@ msgid_plural "Use '%s' to remove them." msgstr[0] "ใà¸à¹‰ '%s' เà¸à¸·à¹ˆà¸à¸–à¸à¸”ถà¸à¸™à¹à¸à¸à¹€à¸à¸ˆà¸”ังà¸à¸¥à¹ˆà¸²à¸§à¹„ด้" #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "คุณà¸à¸²à¸ˆà¹€à¸£à¸µà¸¢à¸ 'apt-get -f install' เà¸à¸·à¹ˆà¸à¹à¸à¹‰à¸›à¸±à¸à¸«à¸²à¸™à¸µà¹‰à¹„ด้:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"มีปัà¸à¸«à¸²à¸„วามขึ้นต่à¸à¸à¸±à¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¹à¸à¸à¹€à¸à¸ˆ à¸à¸£à¸¸à¸“าลà¸à¸‡à¹ƒà¸à¹‰ 'apt-get -f install' โดยไม่ระà¸à¸¸à¹à¸à¸à¹€à¸à¸ˆ " -"(หรืà¸à¸ˆà¸°à¸£à¸°à¸à¸¸à¸—างà¹à¸à¹‰à¸à¹‡à¹„ด้)" - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "จะติดตั้งà¹à¸à¸à¹€à¸à¸ˆà¹€à¸à¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡à¸•à¹ˆà¸à¹„ปนี้:" @@ -2366,7 +2358,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "คำสั่งà¹à¸•à¸à¹à¸Ÿà¹‰à¸¡ '%s' ล้มเหลว\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "à¸à¸£à¸¸à¸“าตรวจสà¸à¸à¸§à¹ˆà¸²à¹„ด้ติดตั้งà¹à¸à¸à¹€à¸à¸ˆ 'dpkg-dev' à¹à¸¥à¹‰à¸§\n" @@ -3325,6 +3316,53 @@ msgstr " %s ไม่มีข้à¸à¸¡à¸¹à¸¥ override สำหรัà¸à¸‹à¸ msgid " %s has no binary override entry either\n" msgstr " %s ไม่มีข้à¸à¸¡à¸¹à¸¥ override สำหรัà¸à¹„à¸à¸™à¸²à¸£à¸µà¹€à¸à¹ˆà¸™à¸à¸±à¸™\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "รà¸à¸«à¸±à¸§à¸‚้à¸à¸¡à¸¹à¸¥" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "เซิร์ฟเวà¸à¸£à¹Œ HTTP ส่งข้à¸à¸¡à¸¹à¸¥à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§à¸•à¸à¸à¸¡à¸²à¹„ม่ถูà¸à¸•à¹‰à¸à¸‡" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "à¸à¸£à¸£à¸—ัดข้à¸à¸¡à¸¹à¸¥à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§à¸œà¸´à¸”à¸à¸¥à¸²à¸”" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "เซิร์ฟเวà¸à¸£à¹Œ HTTP ส่งข้à¸à¸¡à¸¹à¸¥à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§ Content-Length มาไม่ถูà¸à¸•à¹‰à¸à¸‡" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "เซิร์ฟเวà¸à¸£à¹Œ HTTP ส่งข้à¸à¸¡à¸¹à¸¥à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§ Content-Range มาไม่ถูà¸à¸•à¹‰à¸à¸‡" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "à¸à¸²à¸£à¸ªà¸™à¸±à¸à¸ªà¸™à¸¸à¸™ Content-Range ที่เซิร์ฟเวà¸à¸£à¹Œ HTTP ผิดà¸à¸¥à¸²à¸”" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "à¸à¸à¸£à¸¹à¸›à¹à¸à¸à¸§à¸±à¸™à¸—ี่ที่ไม่รู้จัà¸" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "ข้à¸à¸¡à¸¹à¸¥à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§à¸œà¸´à¸”à¸à¸¥à¸²à¸”" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "เà¸à¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¹„ม่สำเร็จ" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "ข้à¸à¸œà¸´à¸”à¸à¸¥à¸²à¸”ภายใน" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3673,57 +3711,16 @@ msgstr "à¸à¸³à¸«à¸™à¸”เวลาà¹à¸à¹‰à¹„ขไม่สำเร็จ" msgid "Connection closed prematurely" msgstr "à¸à¸²à¸£à¹€à¸à¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸–ูà¸à¸›à¸´à¸”à¸à¹ˆà¸à¸™à¹€à¸§à¸¥à¸²à¸à¸±à¸™à¸„วร" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "รà¸à¸«à¸±à¸§à¸‚้à¸à¸¡à¸¹à¸¥" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "เซิร์ฟเวà¸à¸£à¹Œ HTTP ส่งข้à¸à¸¡à¸¹à¸¥à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§à¸•à¸à¸à¸¡à¸²à¹„ม่ถูà¸à¸•à¹‰à¸à¸‡" - -#: methods/server.cc -msgid "Bad header line" -msgstr "à¸à¸£à¸£à¸—ัดข้à¸à¸¡à¸¹à¸¥à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§à¸œà¸´à¸”à¸à¸¥à¸²à¸”" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "เซิร์ฟเวà¸à¸£à¹Œ HTTP ส่งข้à¸à¸¡à¸¹à¸¥à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§ Content-Length มาไม่ถูà¸à¸•à¹‰à¸à¸‡" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "เซิร์ฟเวà¸à¸£à¹Œ HTTP ส่งข้à¸à¸¡à¸¹à¸¥à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§ Content-Range มาไม่ถูà¸à¸•à¹‰à¸à¸‡" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "à¸à¸²à¸£à¸ªà¸™à¸±à¸à¸ªà¸™à¸¸à¸™ Content-Range ที่เซิร์ฟเวà¸à¸£à¹Œ HTTP ผิดà¸à¸¥à¸²à¸”" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "à¸à¸à¸£à¸¹à¸›à¹à¸à¸à¸§à¸±à¸™à¸—ี่ที่ไม่รู้จัà¸" - -#: methods/server.cc -msgid "Bad header data" -msgstr "ข้à¸à¸¡à¸¹à¸¥à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§à¸œà¸´à¸”à¸à¸¥à¸²à¸”" - -#: methods/server.cc -msgid "Connection failed" -msgstr "เà¸à¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¹„ม่สำเร็จ" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "ข้à¸à¸œà¸´à¸”à¸à¸¥à¸²à¸”ภายใน" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "à¹à¸Ÿà¹‰à¸¡à¸§à¹ˆà¸²à¸‡à¹€à¸›à¸¥à¹ˆà¸²à¹„ม่สามารถเป็นà¹à¸Ÿà¹‰à¸¡à¸ˆà¸±à¸”เà¸à¹‡à¸à¸—ี่ใà¸à¹‰à¸à¸²à¸£à¹„ด้" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "รายà¸à¸²à¸£à¹à¸à¸à¹€à¸à¸ˆà¸—ี่ต้à¸à¸‡à¹ƒà¸à¹‰à¹„ม่ครภà¸à¸£à¸¸à¸“าลà¸à¸‡à¹ƒà¸à¹‰à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸ --fix-broken" + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "คุณà¸à¸²à¸ˆà¹€à¸£à¸µà¸¢à¸ 'apt --fix-broken install' เà¸à¸·à¹ˆà¸à¹à¸à¹‰à¸›à¸±à¸à¸«à¸²à¸™à¸µà¹‰à¹„ด้:" + #~ msgid "(not found)" #~ msgstr "(ไม่à¸à¸)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -412,8 +412,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1626,13 +1626,18 @@ msgstr "Hindi mai-minimize ang upgrade set" msgid " Done" msgstr " Tapos" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Maaari ninyong patakbuhin ang 'apt-get -f install' upang ayusin ito." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "" +"Maaari ninyong patakbuhin ang 'apt --fix-broken install' upang ayusin ito." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"May mga dependensiyang kulang. Subukan ang 'apt --fix-broken install' na " +"walang mga pakete (o magtakda ng solusyon)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1819,6 +1824,14 @@ msgid "Broken packages" msgstr "Sirang mga pakete" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o " +"subukang may --fix-missing?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!" @@ -1923,14 +1936,6 @@ msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o " -"subukang may --fix-missing?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado" @@ -1997,19 +2002,6 @@ msgstr[0] "" msgstr[1] "" #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "" -"Maaaring patakbuhin niyo ang 'apt-get -f install' upang ayusin ang mga ito:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " -"mga pakete (o magtakda ng solusyon)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" @@ -2391,7 +2383,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" @@ -3363,6 +3354,53 @@ msgstr " %s ay walang override entry para sa pinagmulan\n" msgid " %s has no binary override entry either\n" msgstr " %s ay wala ring override entry na binary\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Naghihintay ng panimula" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "Nagpadala ang HTTP server ng di tanggap na reply header" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "Maling linyang panimula" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Sira ang range support ng HTTP server na ito" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Di kilalang anyo ng petsa" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Maling datos sa panimula" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Bigo ang koneksyon" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Internal na error" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3718,57 +3756,19 @@ msgstr "Bigo ang pagtakda ng oras ng pagbago" msgid "Connection closed prematurely" msgstr "Nagsara ng maaga ang koneksyon" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Naghihintay ng panimula" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "Nagpadala ang HTTP server ng di tanggap na reply header" - -#: methods/server.cc -msgid "Bad header line" -msgstr "Maling linyang panimula" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Sira ang range support ng HTTP server na ito" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Di kilalang anyo ng petsa" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Maling datos sa panimula" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Bigo ang koneksyon" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Internal na error" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "" +#~ "May mga kulang na dependensiya. Subukan niyong gamitin ang --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "Maaaring patakbuhin niyo ang 'apt --fix-broken install' upang ayusin ang " +#~ "mga ito:" + #~ msgid "(not found)" #~ msgstr "(hindi nahanap)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\n" "PO-Revision-Date: 2016-09-24 03:24+0300\n" "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n" "Language-Team: Debian l10n Turkish <debian-l10n-turkish@lists.debian.org>\n" @@ -431,10 +431,13 @@ msgstr "" "'%s' kullanıcısı sistemde mevcut olmadığı için ayrıcalıklar bırakılamıyor" #: apt-pkg/acquire.cc -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Can't drop privileges for downloading as file '%s' couldn't be accessed " +#| "by user '%s'." msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" "'%2$s' kullanıcısının '%1$s' dosyasına eriÅŸimi olmadığı için dosya " "indirilirken ayrıcalıklar bırakılamıyor." @@ -1668,15 +1671,19 @@ msgstr "YĂ¼kseltme kĂ¼mesi kĂ¼Ă§Ă¼ltĂ¼lemiyor" msgid " Done" msgstr " Tamamlandı" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "" -"Bu sorunları dĂ¼zeltmek için 'apt-get -f install' komutunu çalıştırmanız " -"gerekebilir." +"Bu sorunları dĂ¼zeltmek için 'apt --fix-broken install' komutunu " +"çalıştırmanız gerekebilir." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "Karşılanmayan bağımlılıklar. -f kullanmayı deneyin." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"Karşılanmamış bağımlılıklar. 'apt --fix-broken install' komutunu paket " +"seçeneÄŸi vermeden deneyin (ya da bir çözĂ¼m belirtin)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1871,6 +1878,14 @@ msgid "Broken packages" msgstr "Bozuk paketler" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Bazı arÅŸivler alınamıyor, apt-get update'i çalıştırmayı ya da --fix-missing " +"seçeneÄŸini ekleyerek dĂ¼zeltmeyi deneyin." + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "İç hata, InstallPackages bozuk paketler ile çaÄŸrıldı!" @@ -1978,14 +1993,6 @@ msgid "Download complete and in download only mode" msgstr "Ä°ndirme iÅŸlemi tamamlandı ve sadece indirme kipinde" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Bazı arÅŸivler alınamıyor, apt-get update'i çalıştırmayı ya da --fix-missing " -"seçeneÄŸini ekleyerek dĂ¼zeltmeyi deneyin." - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing seçeneÄŸi ve ortam takası ÅŸu an için desteklenmiyor" @@ -2059,20 +2066,6 @@ msgstr[0] "Bu paketi kaldırmak için '%s' komutunu kullanın." msgstr[1] "Bu paketleri kaldırmak için '%s' komutunu kullanın." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "" -"Bunları dĂ¼zeltmek için 'apt-get -f install' komutunu çalıştırmanız " -"gerekebilir:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Karşılanmamış bağımlılıklar. 'apt-get -f install' komutunu paket seçeneÄŸi " -"vermeden deneyin (ya da bir çözĂ¼m belirtin)." - -#: apt-private/private-install.cc msgid "The following additional packages will be installed:" msgstr "AÅŸağıdaki ek paketler kurulacak:" @@ -2465,7 +2458,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Paket açma komutu '%s' baÅŸarısız.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' paketinin kurulu olduÄŸundan emin olun.\n" @@ -3456,6 +3448,55 @@ msgstr " '%s' paketinin yerine geçecek bir kaynak paket yok\n" msgid " %s has no binary override entry either\n" msgstr " '%s' paketinin yerine geçecek bir ikili paket de yok\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "BaÅŸlıklar bekleniyor" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP sunucusu geçersiz bir cevap baÅŸlığı gönderdi" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "KötĂ¼ baÅŸlık satırı" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP sunucusu geçersiz bir Content-Length baÅŸlığı gönderdi" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP sunucusu geçersiz bir Content-Range baÅŸlığı gönderdi" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "HTTP sunucusunun aralık desteÄŸi bozuk" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "Bilinmeyen tarih biçimi" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "KötĂ¼ baÅŸlık verisi" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "BaÄŸlantı baÅŸarısız" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" +"Sunucudan/vekilden geçersiz yanıt alındığı için %s seçeneÄŸi otomatik olarak " +"devre dışı bırakıldı. (man 5 apt.conf)" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "İç hata" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3807,59 +3848,18 @@ msgstr "DeÄŸiÅŸiklik zamanı ayarlanamadı" msgid "Connection closed prematurely" msgstr "BaÄŸlantı vaktinden önce kapandı" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "BaÅŸlıklar bekleniyor" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "HTTP sunucusu geçersiz bir cevap baÅŸlığı gönderdi" - -#: methods/server.cc -msgid "Bad header line" -msgstr "KötĂ¼ baÅŸlık satırı" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "HTTP sunucusu geçersiz bir Content-Length baÅŸlığı gönderdi" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "HTTP sunucusu geçersiz bir Content-Range baÅŸlığı gönderdi" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "HTTP sunucusunun aralık desteÄŸi bozuk" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "Bilinmeyen tarih biçimi" - -#: methods/server.cc -msgid "Bad header data" -msgstr "KötĂ¼ baÅŸlık verisi" - -#: methods/server.cc -msgid "Connection failed" -msgstr "BaÄŸlantı baÅŸarısız" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" -"Sunucudan/vekilden geçersiz yanıt alındığı için %s seçeneÄŸi otomatik olarak " -"devre dışı bırakıldı. (man 5 apt.conf)" - -#: methods/server.cc -msgid "Internal error" -msgstr "İç hata" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "BoÅŸ dosyalar geçerli birer arÅŸiv dosyası olamazlar" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "Karşılanmayan bağımlılıklar. --fix-broken kullanmayı deneyin." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "Bunları dĂ¼zeltmek için 'apt --fix-broken install' komutunu çalıştırmanız " +#~ "gerekebilir:" + #~ msgid "(not found)" #~ msgstr "(bulunamadı)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -424,8 +424,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1673,14 +1673,19 @@ msgstr "ĐĐµĐ¼Đ¾Đ¶Đ»Đ¸Đ²Đ¾ Đ¼Ñ–Đ½Ñ–Đ¼Ñ–Đ·ÑƒĐ²Đ°Ñ‚Đ¸ Đ½Đ°Đ±Ñ–Ñ€ Đ¾Đ½Đ¾Đ²Đ»ĐµĐ½ÑŒ" msgid " Done" msgstr " Đ’Đ¸ĐºĐ¾Đ½Đ°Đ½Đ¾" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "" -"Đ”Đ»Ñ Đ²Đ¸Đ¿Ñ€Đ°Đ²Đ»ĐµĐ½Đ½Ñ Ñ†Đ¸Ñ… Đ¿Đ¾Đ¼Đ¸Đ»Đ¾Đº Đ²Đ¸ Đ¼Đ¾Đ¶ĐµÑ‚Đµ ÑĐºĐ¾Ñ€Đ¸ÑÑ‚Đ°Ñ‚Đ¸ÑÑ 'apt-get -f install'." +"Đ”Đ»Ñ Đ²Đ¸Đ¿Ñ€Đ°Đ²Đ»ĐµĐ½Đ½Ñ Ñ†Đ¸Ñ… Đ¿Đ¾Đ¼Đ¸Đ»Đ¾Đº Đ²Đ¸ Đ¼Đ¾Đ¶ĐµÑ‚Đµ ÑĐºĐ¾Ñ€Đ¸ÑÑ‚Đ°Ñ‚Đ¸ÑÑ 'apt --fix-broken " +"install'." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "ĐĐµĐ·Đ°Đ´Đ¾Đ²Đ¾Đ»ĐµĐ½Ñ– Đ·Đ°Đ»ĐµĐ¶Đ½Đ¾ÑÑ‚Ñ–. Đ¡Đ¿Ñ€Đ¾Đ±ÑƒĐ¹Ñ‚Đµ Đ²Đ¸ĐºĐ¾Ñ€Đ¸ÑÑ‚Đ°Ñ‚Đ¸ -f." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"ĐĐµĐ·Đ°Đ´Đ¾Đ²Đ¾Đ»ĐµĐ½Ñ– Đ·Đ°Đ»ĐµĐ¶Đ½Đ¾ÑÑ‚Ñ–. Đ¡Đ¿Ñ€Đ¾Đ±ÑƒĐ¹Ñ‚Đµ Đ²Đ¸ĐºĐ¾Đ½Đ°Ñ‚Đ¸ 'apt --fix-broken install', Đ½Đµ " +"Đ²ĐºĐ°Đ·ÑƒÑÑ‡Đ¸ Đ½Đ°Đ·Đ² Đ¿Đ°ĐºÑƒĐ½ĐºÑ–Đ² (Đ°Đ±Đ¾ Đ²ĐºĐ°Đ¶Ñ–Ñ‚ÑŒ Ñ€Ñ–ÑˆĐµĐ½Đ½Ñ)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1866,6 +1871,14 @@ msgid "Broken packages" msgstr "Đ—Đ»Đ°Đ¼Đ°Đ½Ñ– Đ¿Đ°ĐºÑƒĐ½ĐºĐ¸" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"ĐĐµĐ¼Đ¾Đ¶Đ»Đ¸Đ²Đ¾ Đ·Đ°Đ²Đ°Đ½Ñ‚Đ°Đ¶Đ¸Ñ‚Đ¸ деÑĐºÑ– Đ°Ñ€Ñ…Ñ–Đ²Đ¸, Ñ–Đ¼Đ¾Đ²Ñ–Ñ€Đ½Đ¾ Ñ‚Ñ€ĐµĐ±Đ° Đ²Đ¸ĐºĐ¾Đ½Đ°Ñ‚Đ¸ apt-get update " +"Đ°Đ±Đ¾ ÑĐ¿Ñ€Đ¾Đ±ÑƒĐ²Đ°Ñ‚Đ¸ Đ¿Đ¾Đ²Ñ‚Đ¾Ñ€Đ¸Ñ‚Đ¸ Đ·Đ°Đ¿ÑƒÑĐº Đ· ĐºĐ»ÑÑ‡ĐµĐ¼ --fix-missing?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Đ’Đ½ÑƒÑ‚Ñ€Ñ–ÑˆĐ½Ñ Đ¿Đ¾Đ¼Đ¸Đ»ĐºĐ°, InstallPackages Đ±ÑƒĐ»Đ° Đ²Đ¸ĐºĐ»Đ¸ĐºĐ°Đ½Đ° Đ· Đ½ĐµĐ¿Ñ€Đ°Ñ†ĐµĐ·Đ´Đ°Ñ‚Đ½Đ¸Đ¼Đ¸ " @@ -1970,14 +1983,6 @@ msgid "Download complete and in download only mode" msgstr "Đ—Đ°Đ²Đ°Đ½Ñ‚Đ°Đ¶ĐµĐ½Đ½Ñ Đ·Đ°Đ²ĐµÑ€ÑˆĐµĐ½Đ¾ Đ² Ñ€ĐµĐ¶Đ¸Đ¼Ñ– \"Ñ‚Ñ–Đ»ÑŒĐºĐ¸ Đ·Đ°Đ²Đ°Đ½Ñ‚Đ°Đ¶ĐµĐ½Đ½Ñ\"" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"ĐĐµĐ¼Đ¾Đ¶Đ»Đ¸Đ²Đ¾ Đ·Đ°Đ²Đ°Đ½Ñ‚Đ°Đ¶Đ¸Ñ‚Đ¸ деÑĐºÑ– Đ°Ñ€Ñ…Ñ–Đ²Đ¸, Ñ–Đ¼Đ¾Đ²Ñ–Ñ€Đ½Đ¾ Ñ‚Ñ€ĐµĐ±Đ° Đ²Đ¸ĐºĐ¾Đ½Đ°Ñ‚Đ¸ apt-get update " -"Đ°Đ±Đ¾ ÑĐ¿Ñ€Đ¾Đ±ÑƒĐ²Đ°Ñ‚Đ¸ Đ¿Đ¾Đ²Ñ‚Đ¾Ñ€Đ¸Ñ‚Đ¸ Đ·Đ°Đ¿ÑƒÑĐº Đ· ĐºĐ»ÑÑ‡ĐµĐ¼ --fix-missing?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing Ñ– Đ·Đ¼Ñ–Đ½Đ° Đ½Đ¾ÑÑ–Ñ Đ² Đ´Đ°Đ½Đ¸Đ¹ Đ¼Đ¾Đ¼ĐµĐ½Ñ‚ Đ½Đµ Đ¿Ñ–Đ´Ñ‚Ñ€Đ¸Đ¼ÑƒÑ”Ñ‚ÑŒÑÑ" @@ -2057,20 +2062,6 @@ msgstr[1] "Đ’Đ¸ĐºĐ¾Ñ€Đ¸ÑÑ‚Đ¾Đ²ÑƒĐ¹Ñ‚Đµ '%s' Ñ‰Đ¾Đ± Đ²Đ¸Đ´Đ°Đ»Đ¸Ñ‚Đ¸ Ñ—Ñ…." msgstr[2] "Đ’Đ¸ĐºĐ¾Ñ€Đ¸ÑÑ‚Đ¾Đ²ÑƒĐ¹Ñ‚Đµ '%s' Ñ‰Đ¾Đ± Đ²Đ¸Đ´Đ°Đ»Đ¸Ñ‚Đ¸ Ñ—Ñ…." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "" -"ĐœĐ¾Đ¶Đ»Đ¸Đ²Đ¾, Đ´Đ»Ñ Đ²Đ¸Đ¿Ñ€Đ°Đ²Đ»ĐµĐ½Đ½Ñ Ñ†Đ¸Ñ… Đ¿Đ¾Đ¼Đ¸Đ»Đ¾Đº Ви Đ·Đ°Ñ…Đ¾Ñ‡ĐµÑ‚Đµ ÑĐºĐ¾Ñ€Đ¸ÑÑ‚Đ°Ñ‚Đ¸ÑÑ 'apt-get -f " -"install':" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"ĐĐµĐ·Đ°Đ´Đ¾Đ²Đ¾Đ»ĐµĐ½Ñ– Đ·Đ°Đ»ĐµĐ¶Đ½Đ¾ÑÑ‚Ñ–. Đ¡Đ¿Ñ€Đ¾Đ±ÑƒĐ¹Ñ‚Đµ Đ²Đ¸ĐºĐ¾Đ½Đ°Ñ‚Đ¸ 'apt-get -f install', Đ½Đµ " -"Đ²ĐºĐ°Đ·ÑƒÑÑ‡Đ¸ Đ½Đ°Đ·Đ² Đ¿Đ°ĐºÑƒĐ½ĐºÑ–Đ² (Đ°Đ±Đ¾ Đ²ĐºĐ°Đ¶Ñ–Ñ‚ÑŒ Ñ€Ñ–ÑˆĐµĐ½Đ½Ñ)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Đ‘ÑƒĐ´ÑƒÑ‚ÑŒ Đ²ÑÑ‚Đ°Đ½Đ¾Đ²Đ»ĐµĐ½Ñ– Đ½Đ°ÑÑ‚ÑƒĐ¿Đ½Ñ– Đ´Đ¾Đ´Đ°Ñ‚ĐºĐ¾Đ²Ñ– Đ¿Đ°ĐºÑƒĐ½ĐºĐ¸:" @@ -2465,7 +2456,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "ĐĐ¾Đ¼Đ°Đ½Đ´Đ° Ñ€Đ¾Đ·Đ¿Đ°ĐºÑƒĐ²Đ°Đ½Đ½Ñ '%s' Đ·Đ°Đ²ĐµÑ€ÑˆĐ¸Đ»Đ°ÑÑ Đ½ĐµĐ²Đ´Đ°Đ»Đ¾.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ĐŸĐµÑ€ĐµĐ²Ñ–Ñ€Ñ‚Đµ, Ñ‡Đ¸ Đ²ÑÑ‚Đ°Đ½Đ¾Đ²Đ»ĐµĐ½Đ¸Đ¹ Đ¿Đ°ĐºÑƒĐ½Đ¾Đº 'dpkg-dev'.\n" @@ -3459,6 +3449,53 @@ msgstr " Đ’Ñ–Đ´ÑÑƒÑ‚Đ½Ñ–Đ¹ Đ·Đ°Đ¿Đ¸Ñ Đ¿Ñ€Đ¾ Đ¿ĐµÑ€ĐµĐ¿Ñ€Đ¸Đ·Đ½Đ°Ñ‡ĐµĐ½Đ½Ñ Đ² msgid " %s has no binary override entry either\n" msgstr " ĐÑ€Ñ–Đ¼ Ñ‚Đ¾Đ³Đ¾, Đ²Ñ–Đ´ÑÑƒÑ‚Đ½Ñ–Đ¹ Đ·Đ°Đ¿Đ¸Ñ Đ¿Ñ€Đ¾ Đ±Ñ–Đ½Đ°Ñ€Đ½Đµ Đ¿ĐµÑ€ĐµĐ¿Ñ€Đ¸Đ·Đ½Đ°Ñ‡ĐµĐ½Đ½Ñ Đ´Đ»Ñ %s\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "ĐÑ‡Ñ–ĐºÑƒĐ²Đ°Đ½Đ½Ñ Đ½Đ° Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²ĐºĐ¸" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP ÑĐµÑ€Đ²ĐµÑ€ Đ²Ñ–Đ´Ñ–ÑĐ»Đ°Đ² Đ½ĐµĐ²Ñ–Ñ€Đ½Đ¸Đ¹ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²Đ¾Đº 'reply'" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "ĐĐµĐ²Ñ–Ñ€Đ½Đ¸Đ¹ Ñ€ÑĐ´Đ¾Đº Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²ĐºÑƒ" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP ÑĐµÑ€Đ²ĐµÑ€ Đ²Ñ–Đ´Ñ–ÑĐ»Đ°Đ² Đ½ĐµĐ²Ñ–Ñ€Đ½Đ¸Đ¹ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²Đ¾Đº 'Content-Length'" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP ÑĐµÑ€Đ²ĐµÑ€ Đ²Ñ–Đ´Ñ–ÑĐ»Đ°Đ² Đ½ĐµĐ²Ñ–Ñ€Đ½Đ¸Đ¹ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²Đ¾Đº 'Content-Range'" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "Đ¦ĐµĐ¹ HTTP ÑĐµÑ€Đ²ĐµÑ€ Đ¼Đ°Ñ” Đ¿Đ¾Đ»Đ°Đ¼Đ°Đ½Ñƒ Đ¿Ñ–Đ´Ñ‚Ñ€Đ¸Đ¼ĐºÑƒ 'range'" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "ĐĐµĐ²Ñ–Đ´Đ¾Đ¼Đ¸Đ¹ Ñ„Đ¾Ñ€Đ¼Đ°Ñ‚ Đ´Đ°Ñ‚Đ¸" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "ĐŸĐ¾Đ³Đ°Đ½Đ° Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²ĐºĐ¾Đ²Đ° Ñ–Đ½Ñ„Đ¾Ñ€Đ¼Đ°Ñ†Ñ–Ñ" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Đ—'Ñ”Đ´Đ½Đ°Đ½Đ½Ñ Đ½Đµ Đ²Đ´Đ°Đ»Đ¾ÑÑ" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Đ’Đ½ÑƒÑ‚Ñ€Ñ–ÑˆĐ½Ñ Đ¿Đ¾Đ¼Đ¸Đ»ĐºĐ°" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3815,57 +3852,18 @@ msgstr "Đе Đ²Đ´Đ°Đ»Đ¾ÑÑ Đ²ÑÑ‚Đ°Đ½Đ¾Đ²Đ¸Ñ‚Đ¸ Ñ‡Đ°Ñ Đ¼Đ¾Đ´Đ¸Ñ„Ñ–ĐºĐ°Ñ†Ñ–Ñ—" msgid "Connection closed prematurely" msgstr "Đ—'Ñ”Đ´Đ½Đ°Đ½Đ½Ñ Đ·Đ°Đ²ĐµÑ€ÑˆĐµĐ½Đ¾ Đ¿ĐµÑ€ĐµĐ´Ñ‡Đ°ÑĐ½Đ¾" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "ĐÑ‡Ñ–ĐºÑƒĐ²Đ°Đ½Đ½Ñ Đ½Đ° Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²ĐºĐ¸" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "HTTP ÑĐµÑ€Đ²ĐµÑ€ Đ²Ñ–Đ´Ñ–ÑĐ»Đ°Đ² Đ½ĐµĐ²Ñ–Ñ€Đ½Đ¸Đ¹ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²Đ¾Đº 'reply'" - -#: methods/server.cc -msgid "Bad header line" -msgstr "ĐĐµĐ²Ñ–Ñ€Đ½Đ¸Đ¹ Ñ€ÑĐ´Đ¾Đº Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²ĐºÑƒ" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "HTTP ÑĐµÑ€Đ²ĐµÑ€ Đ²Ñ–Đ´Ñ–ÑĐ»Đ°Đ² Đ½ĐµĐ²Ñ–Ñ€Đ½Đ¸Đ¹ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²Đ¾Đº 'Content-Length'" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "HTTP ÑĐµÑ€Đ²ĐµÑ€ Đ²Ñ–Đ´Ñ–ÑĐ»Đ°Đ² Đ½ĐµĐ²Ñ–Ñ€Đ½Đ¸Đ¹ Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²Đ¾Đº 'Content-Range'" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "Đ¦ĐµĐ¹ HTTP ÑĐµÑ€Đ²ĐµÑ€ Đ¼Đ°Ñ” Đ¿Đ¾Đ»Đ°Đ¼Đ°Đ½Ñƒ Đ¿Ñ–Đ´Ñ‚Ñ€Đ¸Đ¼ĐºÑƒ 'range'" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "ĐĐµĐ²Ñ–Đ´Đ¾Đ¼Đ¸Đ¹ Ñ„Đ¾Ñ€Đ¼Đ°Ñ‚ Đ´Đ°Ñ‚Đ¸" - -#: methods/server.cc -msgid "Bad header data" -msgstr "ĐŸĐ¾Đ³Đ°Đ½Đ° Đ·Đ°Đ³Đ¾Đ»Đ¾Đ²ĐºĐ¾Đ²Đ° Ñ–Đ½Ñ„Đ¾Ñ€Đ¼Đ°Ñ†Ñ–Ñ" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Đ—'Ñ”Đ´Đ½Đ°Đ½Đ½Ñ Đ½Đµ Đ²Đ´Đ°Đ»Đ¾ÑÑ" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Đ’Đ½ÑƒÑ‚Ñ€Ñ–ÑˆĐ½Ñ Đ¿Đ¾Đ¼Đ¸Đ»ĐºĐ°" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "ĐŸÑƒÑÑ‚Ñ– Ñ„Đ°Đ¹Đ»Đ¸ Đ½Đµ Đ¼Đ¾Đ¶ÑƒÑ‚ÑŒ Đ±ÑƒÑ‚Đ¸ Đ¿Ñ€Đ°Đ²Đ¸Đ»ÑŒĐ½Đ¸Đ¼Đ¸ Đ°Ñ€Ñ…Ñ–Đ²Đ°Đ¼Đ¸" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "ĐĐµĐ·Đ°Đ´Đ¾Đ²Đ¾Đ»ĐµĐ½Ñ– Đ·Đ°Đ»ĐµĐ¶Đ½Đ¾ÑÑ‚Ñ–. Đ¡Đ¿Ñ€Đ¾Đ±ÑƒĐ¹Ñ‚Đµ Đ²Đ¸ĐºĐ¾Ñ€Đ¸ÑÑ‚Đ°Ñ‚Đ¸ --fix-broken." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "ĐœĐ¾Đ¶Đ»Đ¸Đ²Đ¾, Đ´Đ»Ñ Đ²Đ¸Đ¿Ñ€Đ°Đ²Đ»ĐµĐ½Đ½Ñ Ñ†Đ¸Ñ… Đ¿Đ¾Đ¼Đ¸Đ»Đ¾Đº Ви Đ·Đ°Ñ…Đ¾Ñ‡ĐµÑ‚Đµ ÑĐºĐ¾Ñ€Đ¸ÑÑ‚Đ°Ñ‚Đ¸ÑÑ 'apt-get -f " +#~ "install':" + #~ msgid "(not found)" #~ msgstr "(Đ½Đµ Đ·Đ½Đ°Đ¹Đ´ĐµĐ½Đ¾)" @@ -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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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" @@ -420,8 +420,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1656,13 +1656,17 @@ msgstr "KhĂ´ng thể tối thiểu hĂ³a táºp hợp nĂ¢ng cấp" msgid " Done" msgstr " Xong" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Bạn cĂ³ thể chạy lệnh “apt-get -f install†để sá»a những lá»—i trĂªn." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "Bạn cĂ³ thể chạy lệnh “apt --fix-broken install†để sá»a những lá»—i trĂªn." -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "ChÆ°a thá»a mĂ£n quan hệ phụ thuá»™c. HĂ£y thá» dĂ¹ng tĂ¹y chá»n “-fâ€." +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"ThÆ°a thá»a mĂ£n quan hệ phụ thuá»™c. HĂ£y thá» chạy lệnh “apt --fix-broken " +"install†mĂ khĂ´ng cĂ³ gĂ³i nĂ o (hoặc chỉ định cĂ¡ch thức giải quyết)." #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1846,6 +1850,15 @@ msgid "Broken packages" msgstr "GĂ³i bị há»ng" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"KhĂ´ng thể lấy má»™t số kho, cĂ³ lẽ hĂ£y chạy lệnh “apt-get update†(apt lấy cáºp " +"nháºt)\n" +"hay dĂ¹ng tĂ¹y chá»n “--fix-missing†(sá»a thiếu sĂ³t) khĂ´ng?" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Lá»—i ná»™i bá»™: InstallPackages (cĂ i đặt gĂ³i) được gá»i vá»›i gĂ³i bị há»ng!" @@ -1949,15 +1962,6 @@ msgid "Download complete and in download only mode" msgstr "HoĂ n tất việc tải vá» vĂ trong chế Ä‘á»™ chỉ tải vá»" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"KhĂ´ng thể lấy má»™t số kho, cĂ³ lẽ hĂ£y chạy lệnh “apt-get update†(apt lấy cáºp " -"nháºt)\n" -"hay dĂ¹ng tĂ¹y chá»n “--fix-missing†(sá»a thiếu sĂ³t) khĂ´ng?" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "" "ChÆ°a há»— trợ tĂ¹y chá»n “--fix-missing†(sá»a khi thiếu) vĂ trao đổi phÆ°Æ¡ng tiện." @@ -2024,18 +2028,6 @@ msgid_plural "Use '%s' to remove them." msgstr[0] "HĂ£y dĂ¹ng lệnh “%s†để gỡ bá» chĂºng." #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "CĂ³ lẽ bạn cần chạy lệnh “apt-get -f install†để sá»a những cĂ¡i Ä‘Ă³:" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"ThÆ°a thá»a mĂ£n quan hệ phụ thuá»™c. HĂ£y thá» chạy lệnh “apt-get -f install†mĂ " -"khĂ´ng cĂ³ gĂ³i nĂ o (hoặc chỉ định cĂ¡ch thức giải quyết)." - -#: apt-private/private-install.cc #, fuzzy msgid "The following additional packages will be installed:" msgstr "Những gĂ³i thĂªm theo Ä‘Ă¢y sẽ được cĂ i đặt:" @@ -2421,7 +2413,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nĂ©n “%s†bị lá»—i.\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "HĂ£y kiểm tra xem gĂ³i “dpkg-devâ€ Ä‘Ă£ được cĂ i đặt chÆ°a.\n" @@ -3425,6 +3416,57 @@ msgstr " %s khĂ´ng cĂ³ mục ghi đè (override) nguồn\n" msgid " %s has no binary override entry either\n" msgstr " %s cÅ©ng khĂ´ng cĂ³ mục ghi đè (override) nhị phĂ¢n\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "Äang đợi phần đầu dữ liệu..." + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "MĂ¡y phục vụ HTTP Ä‘Ă£ gá»i má»™t dĂ²ng đầu trả lá»i khĂ´ng hợp lệ" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "DĂ²ng đầu sai" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "" +"MĂ¡y phục vụ HTTP Ä‘Ă£ gá»i má»™t dĂ²ng đầu Content-Length (Ä‘á»™ dĂ i ná»™i dung) khĂ´ng " +"hợp lệ" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "" +"MĂ¡y phục vụ HTTP Ä‘Ă£ gá»i má»™t dĂ²ng đầu Content-Range (phạm vi ná»™i dung) khĂ´ng " +"hợp lệ" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "MĂ¡y phục vụ HTTP khĂ´ng há»— trợ tải má»™t phần táºp tin" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "KhĂ´ng rõ định dạng ngĂ y" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "Dữ liệu phần đầu sai" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "Kết nối bị lá»—i" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "Gặp lá»—i ná»™i bá»™" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3779,61 +3821,18 @@ msgstr "Gặp lá»—i khi đặt giá» sá»a đổi" msgid "Connection closed prematurely" msgstr "Kết nối bị Ä‘Ă³ng bất ngá»" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "Äang đợi phần đầu dữ liệu..." - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "MĂ¡y phục vụ HTTP Ä‘Ă£ gá»i má»™t dĂ²ng đầu trả lá»i khĂ´ng hợp lệ" - -#: methods/server.cc -msgid "Bad header line" -msgstr "DĂ²ng đầu sai" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "" -"MĂ¡y phục vụ HTTP Ä‘Ă£ gá»i má»™t dĂ²ng đầu Content-Length (Ä‘á»™ dĂ i ná»™i dung) khĂ´ng " -"hợp lệ" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "" -"MĂ¡y phục vụ HTTP Ä‘Ă£ gá»i má»™t dĂ²ng đầu Content-Range (phạm vi ná»™i dung) khĂ´ng " -"hợp lệ" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "MĂ¡y phục vụ HTTP khĂ´ng há»— trợ tải má»™t phần táºp tin" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "KhĂ´ng rõ định dạng ngĂ y" - -#: methods/server.cc -msgid "Bad header data" -msgstr "Dữ liệu phần đầu sai" - -#: methods/server.cc -msgid "Connection failed" -msgstr "Kết nối bị lá»—i" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "Gặp lá»—i ná»™i bá»™" - #: methods/store.cc 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 "Unmet dependencies. Try using --fix-broken." +#~ msgstr "" +#~ "ChÆ°a thá»a mĂ£n quan hệ phụ thuá»™c. HĂ£y thá» dĂ¹ng tĂ¹y chá»n “--fix-brokenâ€." + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "" +#~ "CĂ³ lẽ bạn cần chạy lệnh “apt --fix-broken install†để sá»a những cĂ¡i Ä‘Ă³:" + #~ msgid "(not found)" #~ msgstr "(khĂ´ng tìm thấy)" diff --git a/po/zh_CN.po b/po/zh_CN.po index 799c0445a..d253301ee 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,14 +4,14 @@ # Tchaikov <tchaikov@sjtu.org>, 2005, 2007. # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006. # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010. -# Zhou Mo <cdluminate@gmail.com>, 2014, 2015, 2016. +# Zhou Mo <cdluminate@gmail.com>, 2014, 2015, 2016, 2017. # msgid "" msgstr "" -"Project-Id-Version: apt 1.2.x\n" +"Project-Id-Version: apt 1.4.x\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2016-11-25 23:46+0100\n" -"PO-Revision-Date: 2016-08-20 13:00+0000\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\n" +"PO-Revision-Date: 2017-01-26 12:00+0000\n" "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" "Language: zh_CN\n" @@ -412,9 +412,9 @@ msgstr "系统ä¸ä¸å˜åœ¨æ²™ç®±ç”¨æˆ·'%s'ï¼Œæ— æ³•é™ä½æƒé™" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." -msgstr "文件'%s'æ— æ³•è¢«ç”¨æˆ·'%s'è®¿é—®ï¼Œæ— æ³•é™ä½æƒé™ä»¥è¿›è¡Œä¸‹è½½ă€‚" +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." +msgstr "ç”±äºæ–‡ä»¶'%s'æ— æ³•è¢«ç”¨æˆ·'%s'访问，已脱离沙盒并ææƒä¸ºæ ¹ç”¨æˆ·æ¥è¿›è¡Œä¸‹è½½ă€‚" #: apt-pkg/acquire.cc apt-pkg/clean.cc #, c-format @@ -1609,13 +1609,17 @@ msgstr "æ— æ³•æœ€å°åŒ–å¾…å‡çº§è½¯ä»¶åŒ…集åˆ" msgid " Done" msgstr " 完æˆ" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "您也许需è¦è¿è¡Œâ€œapt-get -f installâ€æ¥ä¿®æ£ä¸é¢ç„é”™è¯¯ă€‚" +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "您也许需è¦è¿è¡Œâ€œapt --fix-broken installâ€æ¥ä¿®æ£ä¸é¢ç„é”™è¯¯ă€‚" -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "ä¸èƒ½æ»¡è¶³ä¾èµ–å…³ç³»ă€‚ä¸å¦¨è¯•ä¸€ä¸‹ -f é€‰é¡¹ă€‚" +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"有未能满足ç„ä¾èµ–å…³ç³»ă€‚è¯·å°è¯•ä¸æŒ‡æ˜è½¯ä»¶åŒ…ç„åå—æ¥è¿è¡Œâ€œapt --fix-broken " +"installâ€(也å¯ä»¥æŒ‡å®ä¸€ä¸ªè§£å†³å法)。" #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1801,6 +1805,14 @@ msgid "Broken packages" msgstr "ç ´æŸç„软件包" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"æœ‰å‡ ä¸ªè½¯ä»¶åŒ…æ— æ³•ä¸‹è½½ï¼Œè¦ä¸è¿è¡Œ apt-get update 或者å ä¸ --fix-missing ç„选项å†" +"试试？" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部错误，InstallPackages 被用在了æŸåç„软件包ä¸ï¼" @@ -1901,14 +1913,6 @@ msgid "Download complete and in download only mode" msgstr "äºâ€œä»…下载â€æ¨¡å¼ä¸ä¸‹è½½å®Œæ¯•" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"æœ‰å‡ ä¸ªè½¯ä»¶åŒ…æ— æ³•ä¸‹è½½ï¼Œè¦ä¸è¿è¡Œ apt-get update 或者å ä¸ --fix-missing ç„选项å†" -"试试？" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "ç›®å‰ä¸æ”¯æŒ --fix-missing 和介质交æ¢" @@ -1969,18 +1973,6 @@ msgid_plural "Use '%s' to remove them." msgstr[0] "使用'%s'æ¥å¸è½½å®ƒ(它们)。" #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "您å¯èƒ½éœ€è¦è¿è¡Œâ€œapt-get -f installâ€æ¥çº æ£ä¸‹åˆ—错误ï¼" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"有未能满足ç„ä¾èµ–å…³ç³»ă€‚è¯·å°è¯•ä¸æŒ‡æ˜è½¯ä»¶åŒ…ç„åå—æ¥è¿è¡Œâ€œapt-get -f installâ€(也å¯" -"以指å®ä¸€ä¸ªè§£å†³å法)。" - -#: apt-private/private-install.cc msgid "The following additional packages will be installed:" msgstr "å°†ä¼åŒæ—¶å®‰è£…下列软件ï¼" @@ -2361,7 +2353,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "è¿è¡Œè§£åŒ…ç„命令“%sâ€å‡ºé”™ă€‚\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是å¦å®‰è£…了“dpkg-devâ€è½¯ä»¶åŒ…。\n" @@ -3322,6 +3313,53 @@ msgstr " %s 没有æºä»£ç ç„ override 项\n" msgid " %s has no binary override entry either\n" msgstr " %s ä¸æ²¡æœ‰äºŒè¿›åˆ¶æ–‡ä»¶ç„ override 项\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "æ£åœ¨ç‰å¾…æ¥å¤´" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "该 HTTP æœå¡å™¨å‘é€äº†ä¸€ä¸ªæ— 效ç„应ç”æ¥å¤´" + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "错误ç„æ¥å¤´è¡Œ" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "该 HTTP æœå¡å™¨å‘é€äº†ä¸€ä¸ªæ— æ•ˆç„ Content-Length æ¥å¤´" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "该 HTTP æœå¡å™¨å‘é€äº†ä¸€ä¸ªæ— æ•ˆç„ Content-Range æ¥å¤´" + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "该 HTTP æœå¡å™¨ç„ range 支æŒä¸æ£å¸¸" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "æ— æ³•è¯†åˆ«ç„æ—¥æœŸæ ¼å¼" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "错误ç„æ¥å¤´æ•°æ®" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "è¿æ¥å¤±è´¥" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "ç”±äºæœå¡å™¨æˆ–代ç†ç„å“åº”é”™è¯¯ï¼Œå› æ¤è‡ªå¨ç¦æ¢ %să€‚ï¼ˆå‚è§ man 5 apt.conf）" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "内部错误" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3670,57 +3708,16 @@ msgstr "æ— æ³•è®¾ç½®æ–‡ä»¶ç„修改日期" msgid "Connection closed prematurely" msgstr "è¿æ¥è¢«æ°¸ä¹…å…³é—" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "æ£åœ¨ç‰å¾…æ¥å¤´" - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "该 HTTP æœå¡å™¨å‘é€äº†ä¸€ä¸ªæ— 效ç„应ç”æ¥å¤´" - -#: methods/server.cc -msgid "Bad header line" -msgstr "错误ç„æ¥å¤´è¡Œ" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "该 HTTP æœå¡å™¨å‘é€äº†ä¸€ä¸ªæ— æ•ˆç„ Content-Length æ¥å¤´" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "该 HTTP æœå¡å™¨å‘é€äº†ä¸€ä¸ªæ— æ•ˆç„ Content-Range æ¥å¤´" - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "该 HTTP æœå¡å™¨ç„ range 支æŒä¸æ£å¸¸" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "æ— æ³•è¯†åˆ«ç„æ—¥æœŸæ ¼å¼" - -#: methods/server.cc -msgid "Bad header data" -msgstr "错误ç„æ¥å¤´æ•°æ®" - -#: methods/server.cc -msgid "Connection failed" -msgstr "è¿æ¥å¤±è´¥" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "ç”±äºæœå¡å™¨æˆ–代ç†ç„å“åº”é”™è¯¯ï¼Œå› æ¤è‡ªå¨ç¦æ¢ %să€‚ï¼ˆå‚è§ man 5 apt.conf）" - -#: methods/server.cc -msgid "Internal error" -msgstr "内部错误" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "空文件ä¸æ˜¯æœ‰æ•ˆå½’æ¡£" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "ä¸èƒ½æ»¡è¶³ä¾èµ–å…³ç³»ă€‚ä¸å¦¨è¯•ä¸€ä¸‹ --fix-broken é€‰é¡¹ă€‚" + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "您å¯èƒ½éœ€è¦è¿è¡Œâ€œapt --fix-broken installâ€æ¥çº æ£ä¸‹åˆ—错误ï¼" + #~ msgid "(not found)" #~ msgstr "(没有找到)" diff --git a/po/zh_TW.po b/po/zh_TW.po index fbdf68844..b9e53ce9c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -10,7 +10,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: 2016-11-25 23:46+0100\n" +"POT-Creation-Date: 2017-09-13 17:18+0000\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." @@ -408,8 +408,8 @@ msgstr "" #: apt-pkg/acquire.cc #, c-format msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." +"Download is performed unsandboxed as root as file '%s' couldn't be accessed " +"by user '%s'." msgstr "" #: apt-pkg/acquire.cc apt-pkg/clean.cc @@ -1599,13 +1599,17 @@ msgstr "無法將å‡ç´è¨ˆåƒæœ€å°åŒ–" msgid " Done" msgstr " 完æˆ" -#: apt-private/private-cachefile.cc -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "您也許得執行 'apt-get -f install' 以修æ£é€™äº›å•é¡Œă€‚" +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "You might want to run 'apt --fix-broken install' to correct these." +msgstr "您也許得執行 'apt --fix-broken install' 以修æ£é€™äº›å•é¡Œă€‚" -#: apt-private/private-cachefile.cc -msgid "Unmet dependencies. Try using -f." -msgstr "未能滿足相ä¾é—œä¿‚ă€‚è©¦è©¦ -f é¸é …。" +#: apt-private/private-cachefile.cc apt-private/private-install.cc +msgid "" +"Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " +"specify a solution)." +msgstr "" +"未能滿足相ä¾é—œä¿‚ă€‚è«‹è©¦è‘—ä¸æŒ‡å®å¥—件來執行 'apt --fix-broken install'（或æ¡å–å…¶" +"它ç„è§£æ±ºæ–¹æ¡ˆï¼‰ă€‚" #: apt-private/private-cacheset.cc apt-private/private-search.cc msgid "Sorting" @@ -1785,6 +1789,14 @@ msgid "Broken packages" msgstr "æ毀ç„套件" #: apt-private/private-install.cc +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"有部份套件檔無法å–得，試著執行 apt-get update 或者試著å ä¸ --fix-missing é¸" +"é …ï¼Ÿ" + +#: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "內部錯誤，在æ毀ç„套件ä¸åŸ·è¡Œ InstallPackagesï¼" @@ -1884,14 +1896,6 @@ msgid "Download complete and in download only mode" msgstr "下載完æˆï¼Œä¸”這是ă€åƒ…下載ă€æ¨¡å¼" #: apt-private/private-install.cc -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"有部份套件檔無法å–得，試著執行 apt-get update 或者試著å ä¸ --fix-missing é¸" -"é …ï¼Ÿ" - -#: apt-private/private-install.cc msgid "--fix-missing and media swapping is not currently supported" msgstr "ç›®å‰å°æœªæ”¯æ´ --fix-missing 和媒體æ½æ›" @@ -1959,18 +1963,6 @@ msgstr[0] "使用 '%s' ä¾†å°‡å…¶ç§»é™¤ă€‚" msgstr[1] "使用 '%s' ä¾†å°‡å…¶ç§»é™¤ă€‚" #: apt-private/private-install.cc -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "您也許得執行 'apt-get -f install' 以修æ£é€™äº›å•é¡Œï¼" - -#: apt-private/private-install.cc -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"未能滿足相ä¾é—œä¿‚ă€‚è«‹è©¦è‘—ä¸æŒ‡å®å¥—件來執行 'apt-get -f install'（或æ¡å–其它ç„解" -"æ±ºæ–¹æ¡ˆï¼‰ă€‚" - -#: apt-private/private-install.cc msgid "The following additional packages will be installed:" msgstr "下列ç„é¡å¤–套件將被安è£ï¼" @@ -2349,7 +2341,6 @@ msgid "Unpack command '%s' failed.\n" msgstr "解開指令 '%s' å¤±æ•—ă€‚\n" #: apt-private/private-source.cc -#, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "請檢查是å¦å·²å®‰è£äº† 'dpkg-dev' å¥—ä»¶ă€‚\n" @@ -3310,6 +3301,53 @@ msgstr " %s 沒有åŸå§‹ç¢¼é‡æ–°å®ç¾©é …ç›®\n" msgid " %s has no binary override entry either\n" msgstr " %s 也沒有二元碼é‡æ–°å®ç¾©é …ç›®\n" +#: methods/basehttp.cc +msgid "Waiting for headers" +msgstr "ç‰å¾…標é " + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP 伺æœå™¨å‚³é€äº†ä¸€å€‹ç„¡æ•ˆç„å›è¦†æ¨™é " + +#: methods/basehttp.cc +msgid "Bad header line" +msgstr "標é 行錯誤" + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP 伺æœå™¨å‚³é€äº†ä¸€å€‹ç„¡æ•ˆç„ Content-Length 標é " + +#: methods/basehttp.cc +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP 伺æœå™¨å‚³é€äº†ä¸€å€‹ç„¡æ•ˆç„ Content-Range 標é " + +#: methods/basehttp.cc +msgid "This HTTP server has broken range support" +msgstr "這個 HTTP 伺æœå™¨ç„範åœæ”¯æ´æœ‰å•é¡Œ" + +#: methods/basehttp.cc +msgid "Unknown date format" +msgstr "未知ç„è³‡æ–™æ ¼å¼" + +#: methods/basehttp.cc +msgid "Bad header data" +msgstr "錯誤ç„標é 資料" + +#: methods/basehttp.cc +msgid "Connection failed" +msgstr "連ç·å¤±æ•—" + +#: methods/basehttp.cc +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/basehttp.cc +msgid "Internal error" +msgstr "內部錯誤" + #: methods/cdrom.cc #, c-format msgid "Unable to read the cdrom database %s" @@ -3658,57 +3696,16 @@ msgstr "無法è¨å®ä¿®æ”¹æ™‚é–“" msgid "Connection closed prematurely" msgstr "連ç·çªç„¶çµ‚æ¢" -#: methods/server.cc -msgid "Waiting for headers" -msgstr "ç‰å¾…標é " - -#: methods/server.cc -msgid "The HTTP server sent an invalid reply header" -msgstr "HTTP 伺æœå™¨å‚³é€äº†ä¸€å€‹ç„¡æ•ˆç„å›è¦†æ¨™é " - -#: methods/server.cc -msgid "Bad header line" -msgstr "標é 行錯誤" - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "HTTP 伺æœå™¨å‚³é€äº†ä¸€å€‹ç„¡æ•ˆç„ Content-Length 標é " - -#: methods/server.cc -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "HTTP 伺æœå™¨å‚³é€äº†ä¸€å€‹ç„¡æ•ˆç„ Content-Range 標é " - -#: methods/server.cc -msgid "This HTTP server has broken range support" -msgstr "這個 HTTP 伺æœå™¨ç„範åœæ”¯æ´æœ‰å•é¡Œ" - -#: methods/server.cc -msgid "Unknown date format" -msgstr "未知ç„è³‡æ–™æ ¼å¼" - -#: methods/server.cc -msgid "Bad header data" -msgstr "錯誤ç„標é 資料" - -#: methods/server.cc -msgid "Connection failed" -msgstr "連ç·å¤±æ•—" - -#: methods/server.cc -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc -msgid "Internal error" -msgstr "內部錯誤" - #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "" +#~ msgid "Unmet dependencies. Try using --fix-broken." +#~ msgstr "未能滿足相ä¾é—œä¿‚ă€‚è©¦è©¦ --fix-broken é¸é …。" + +#~ msgid "You might want to run 'apt --fix-broken install' to correct these:" +#~ msgstr "您也許得執行 'apt --fix-broken install' 以修æ£é€™äº›å•é¡Œï¼" + #~ msgid "(not found)" #~ msgstr "(未找到)" diff --git a/prepare-release b/prepare-release index 0004de310..8c4e0978b 100755 --- a/prepare-release +++ b/prepare-release @@ -215,6 +215,69 @@ elif [ "$1" = 'coverage' ]; then 'apt-inst' 'apt-inst/deb' 'apt-inst/contrib' 'apt-private' done genhtml --output-directory "${DIR}" "${DIR}/apt.coverage.fixed" ${LCOVRC} +elif [ "$1" = 'spellcheckers' ]; then + echo '### codespell in source directories:' + codespell --enable-colors $(find . -mindepth 1 -maxdepth 1 -type d \! -name '.git' \! -name 'doc' \! -name 'po' \! -name 'build' \! -name 'test') | \ + grep -v '^.*debian/changelog.*Troup.*==>.*Troupe.*$' || true + echo '### codespell in testcases:' + codespell $(find test -type f \! -name 'status-*' \! -name 'Packages-*' \! -name '*.deb' \! -name '*.sec' \! -name '*.pub' \! -name '*.db') + echo '### codespell in documentation:' + codespell doc/*.xml doc/*.txt doc/*.dbk doc/*.ent doc/*.cmake.in doc/xml.add doc/po4a.conf doc/examples doc/po/apt-doc.pot po/apt-all.pot README.* COPYING + + echo '### spellintian in source directories:' + { + for DIR in $(find . -mindepth 1 -maxdepth 1 -type d \! -name '.git' \! -name 'doc' \! -name 'po' \! -name 'build' \! -name 'test'); do + spellintian $(find "$DIR" -type f) + done + } | grep -v \ + -e '^.*: long long (duplicate word) -> long$' \ + -e '^./apt-pkg/pkgcache.h: ID ID (duplicate word) -> ID$' \ + -e '^./apt-pkg/contrib/mmap.cc: WorkSpace WorkSpace (duplicate word) -> WorkSpace$' \ + -e '^./apt-pkg/contrib/md5.cc: z z (duplicate word) -> z$' \ + -e '^./apt-pkg/metaindex.cc: const const (duplicate word) -> const$' \ + -e '^./apt-pkg/acquire-method.cc: QueueBack QueueBack (duplicate word) -> QueueBack$' \ + -e '^./CMake/Translations.cmake: domain domain (duplicate word) -> domain$' \ + -e '^./CMake/apti18n.h.in: m m (duplicate word) -> m$' \ + -e '^./CMake/run_if_exists.sh: fi fi (duplicate word) -> fi$' \ + -e '^./ftparchive/byhash.cc: ByHash ByHash (duplicate word) -> ByHash$' \ + -e '^./ftparchive/writer.cc: this Packages -> these packages$' \ + -e '^./ftparchive/byhash.h: ByHash ByHash (duplicate word) -> ByHash$' \ + -e '^./cmdline/apt-key.in: done done (duplicate word) -> done$' \ + -e '^./cmdline/apt-key.in: fi fi (duplicate word) -> fi$' \ + -e '^./cmdline/apt-key.in: echo echo (duplicate word) -> echo$' \ + -e '^./triehash/.travis.yml: perl perl (duplicate word) -> perl$' \ + -e '^./triehash/README.md: Performance Performance (duplicate word) -> Performance$' \ + -e '^./debian/apt.apt-compat.cron.daily: fi fi (duplicate word) -> fi$' \ + -e '^./debian/apt.auto-removal.sh: done done (duplicate word) -> done$' \ + -e '^./debian/apt.systemd.daily: fi fi (duplicate word) -> fi$' \ + -e '^./debian/apt.postinst: fi fi (duplicate word) -> fi$' \ + -e '^./methods/http.cc: Sz Sz (duplicate word) -> Sz$' \ + -e '^./methods/ftp.cc: AFMap AFMap (duplicate word) -> AFMap$' \ + -e '^./dselect/install: fi fi (duplicate word) -> fi$' \ + || true + echo '### spellintian in testcases:' + spellintian $(find test -type f \! -name 'status-*' \! -name 'Packages-*' \! -name '*.deb' \! -name '*.sec' \! -name '*.pub' \! -name '*.db') \ + | grep -v \ + -e '^.*: long long (duplicate word) -> long$' \ + -e '^test/integration/.*: fi fi (duplicate word) -> fi$' \ + -e '^test/integration/.*: done done (duplicate word) -> done$' \ + -e '^test/integration/.*: echo echo (duplicate word) -> echo$' \ + -e '^test/integration/test-00-commands-have-help: moo moo (duplicate word) -> moo$' \ + -e '^test/integration/test-apt-cache: bar bar (duplicate word) -> bar$' \ + -e '^test/integration/test-sourceslist-trusted-options: everythingsucceeds everythingsucceeds (duplicate word) -> everythingsucceeds$' \ + -e '^test/integration/test-sourceslist-trusted-options: everythingfails everythingfails (duplicate word) -> everythingfails$' \ + -e '^test/integration/test-apt-get-changelog: foo foo (duplicate word) -> foo$' \ + -e '^test/integration/test-ubuntu-bug-761175-remove-purge: testround testround (duplicate word) -> testround$' \ + -e '^test/integration/test-apt-get-download: apt apt (duplicate word) -> apt$' \ + -e '^test/integration/test-apt-showlist-orgroup-in-recommends: zzz zzz (duplicate word) -> zzz$' \ + -e '^test/integration/test-bug-691453-apt-cache-search-multi-pattern: bar bar (duplicate word) -> bar$' \ + -e '^test/integration/test-allow: hold hold (duplicate word) -> hold$' \ + -e '^test/integration/test-apt-by-hash-update: ensureitsbroken ensureitsbroken (duplicate word) -> ensureitsbroken$' \ + -e '^test/integration/test-apt-source-and-build-dep: foo foo (duplicate word) -> foo$' \ + || true + echo '### spellintian in documentation:' + spellintian doc/*.xml doc/*.txt doc/*.dbk doc/*.ent doc/*.cmake.in doc/xml.add doc/po4a.conf doc/examples/* doc/po/apt-doc.pot po/apt-all.pot README.* COPYING + else echo >&1 "Usage:\t$0 pre-export \t$0 pre-build @@ -242,6 +305,11 @@ Both will format the diff properly. used by .travis.yml. »coverage« does a clean build with the right flags for coverage reporting, runs all tests and generates a html report in the end. + +\t$0 spellcheckers + +»spellcheckers« runs »codespell« and »spellintian« on the appropiate files and +filters out obvious false positives. " fi diff --git a/shippable.yml b/shippable.yml index 24b2545f7..ad72afc80 100644 --- a/shippable.yml +++ b/shippable.yml @@ -2,8 +2,8 @@ language: none build: pre_ci_boot: - image_name: ubuntu - image_tag: xenial + image_name: debian + image_tag: stretch pull: true ci: - apt-get install -qq build-essential diff --git a/test/integration/framework b/test/integration/framework index 05c8fcd2a..a424f1559 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -340,6 +340,7 @@ setupenvironment() { # ----- cd "$TMPWORKINGDIRECTORY" + echo "#x-apt-configure-index \"${SOURCEDIRECTORY}/doc/examples/configure-index\";" > aptconfig.conf mkdir rootdir aptarchive keys cd rootdir mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d @@ -1157,6 +1158,30 @@ setupaptarchive() { fi } +killgpgagent() { + if [ -z "${TMPWORKINGDIRECTORY}" ]; then return; fi + local GPGHOME="${TMPWORKINGDIRECTORY}/signinghome" + if [ -e "${GPGHOME}" ]; then return; fi + # ensure the agent dies quickly as different versions have different suicide heuristics + GNUPGHOME="${GPGHOME}" gpgconf --kill gpg-agent >/dev/null 2>&1 || true + rm -rf "$GPGHOME" +} +dosigning() { + local KEY="$1" + shift + local GPGHOME="${TMPWORKINGDIRECTORY}/signinghome" + if [ -n "$APT_TEST_SIGNINGHOME" ]; then + GPGHOME="$APT_TEST_SIGNINGHOME" + else + if [ ! -e "$GPGHOME" ]; then + mkdir -p --mode=700 "${GPGHOME}" + addtrap 'prefix' 'killgpgagent;' + fi + fi + testsuccess aptkey --quiet --keyring ${KEY}.pub --secret-keyring ${KEY}.sec --readonly \ + --homedir "${GPGHOME}" adv --batch --yes --digest-algo "${APT_TESTS_DIGEST_ALGO:-SHA512}" \ + "$@" +} signreleasefiles() { local SIGNERS="${1:-Joe Sixpack}" local REPODIR="${2:-aptarchive}" @@ -1177,7 +1202,7 @@ signreleasefiles() { # FIXME: This should be the full name, but we can't encode the space properly currently SIGUSERS="${SIGUSERS} -u ${SIGNER#* }" if [ "${SIGNER}" = 'Rex Expired' ]; then - # the key is expired, so gpg doesn't allow to sign with and the --faked-system-time + # the key is expired, so gpg doesn't allow one to sign with and the --faked-system-time # option doesn't exist anymore (and using faketime would add a new obscure dependency) # therefore we 'temporary' make the key not expired and restore a backup after signing cp "${REXKEY}.sec" "$SECEXPIREBAK" @@ -1208,21 +1233,20 @@ signreleasefiles() { mv "${KEY}.new.pub" "${KEY}.pub" mv "${KEY}.new.sec" "${KEY}.sec" fi - local GPG="aptkey --quiet --keyring ${KEY}.pub --secret-keyring ${KEY}.sec --readonly adv --batch --yes --digest-algo ${APT_TESTS_DIGEST_ALGO:-SHA512}" for RELEASE in $(find "${REPODIR}/" -name Release); do # we might have set a specific date for the Release file, so copy it local DATE="$(stat --format "%y" "${RELEASE}")" if [ "$APT_DONT_SIGN" = 'Release.gpg' ]; then rm -f "${RELEASE}.gpg" else - testsuccess $GPG "$@" $SIGUSERS --armor --detach-sign --sign --output "${RELEASE}.gpg" "${RELEASE}" + dosigning "$KEY" "$@" $SIGUSERS --armor --detach-sign --sign --output "${RELEASE}.gpg" "${RELEASE}" touch -d "$DATE" "${RELEASE}.gpg" fi local INRELEASE="${RELEASE%/*}/InRelease" if [ "$APT_DONT_SIGN" = 'InRelease' ]; then rm -f "$INRELEASE" else - testsuccess $GPG "$@" $SIGUSERS --clearsign --output "$INRELEASE" "$RELEASE" + dosigning "$KEY" "$@" $SIGUSERS --clearsign --output "$INRELEASE" "$RELEASE" touch -d "$DATE" "${INRELEASE}" fi done @@ -1404,12 +1428,12 @@ checkdiff() { local TMPFILE2="${TMPWORKINGDIRECTORY}/rootdir/tmp/checkdiff.2.tmp" touch "$TMPFILE1" "$TMPFILE2" if [ "$1" != '-' ]; then - sed -e '/^profiling:/ d' < "$1" >"$TMPFILE1" + sed -e '/^profiling:/ d' -e '/\.\.\.profiling:/{N;s#\.\.\.profiling:.*\n#...#g}' < "$1" >"$TMPFILE1" else TMPFILE1='-' fi if [ "$2" != '-' ]; then - sed -e '/^profiling:/ d' < "$2" >"$TMPFILE2" + sed -e '/^profiling:/ d' -e '/\.\.\.profiling:/{N;s#\.\.\.profiling:.*\n#...#g}' < "$2" >"$TMPFILE2" else TMPFILE2='-' fi diff --git a/test/integration/run-tests b/test/integration/run-tests index 7c0b74ce2..80f1fc61d 100755 --- a/test/integration/run-tests +++ b/test/integration/run-tests @@ -107,6 +107,17 @@ if [ -n "$APT_TEST_JOBS" ]; then fi exec $parallel -j "$APT_TEST_JOBS" "./$(basename "$0")" -- $(echo "$TESTLIST") fi + +APT_TEST_SIGNINGHOME="$(mktemp --directory --tmpdir 'apt-key-signinghome.XXXXXXXXXX')" +removesigninghome() { + if [ -z "$APT_TEST_SIGNINGHOME" ]; then return; fi + GNUPGHOME="${APT_TEST_SIGNINGHOME}" gpgconf --kill gpg-agent >/dev/null 2>&1 || true + rm -rf -- "$APT_TEST_SIGNINGHOME" +} +trap "exit 1" 0 HUP INT ILL ABRT FPE SEGV PIPE TERM +trap "removesigninghome" 0 QUIT +export APT_TEST_SIGNINGHOME + TOTAL="$(echo "$TESTLIST" | wc -l)" if [ "$MSGLEVEL" -le 1 ]; then printf "${CTEST}Running testcases${CRESET}: " diff --git a/test/integration/test-00-commands-have-help b/test/integration/test-00-commands-have-help index 699cdef15..2d8fa1105 100755 --- a/test/integration/test-00-commands-have-help +++ b/test/integration/test-00-commands-have-help @@ -63,3 +63,26 @@ testsuccess aptget moo moo moo testsuccess aptget moo moo moo -q=2 testsuccess aptget moo moo moo moo testsuccess aptget moo moo moo moo -q=2 + +export SOURCE_DATE_EPOCH=moo +testwarningmsg 'W: Environment variable SOURCE_DATE_EPOCH was ignored as it has an invalid value: "moo"' apt moo +testmoo() { + export SOURCE_DATE_EPOCH="$(date -d "$1" +'%s')" + testsuccess aptget moo + cp rootdir/tmp/testsuccess.output moo.output + testsuccess grep "$2" moo.output + testsuccessequal "$2" apt moo -qqq + unset SOURCE_DATE_EPOCH +} +testmoo '@0' 'Have you mooed today?' +# the year 0 is too early for 32bit architectures +testmoo '2000-12-25' 'Happy package management day!' +testmoo '1930-02-18' "It's a Bird ... It's a Plane ... It's Super Cow!" +testmoo '1966-11-07' 'Whoever needs milk, bows to the animal.' +testmoo '1988-03-29' 'Have you mooed today?' +testmoo '1993-08-16' 'Three moos for Debian!' +testmoo '1998-04-01' 'Have you smashed some milk today?' +testmoo '@1484822790' 'Have you mooed today?' +testmoo '@1484822791' 'Have you mooed today?' +testmoo '@1484822792' 'Have you mooed today?' +testmoo '@1484822793' 'Have you mooed today?' diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom index 212f0baa4..01680c461 100755 --- a/test/integration/test-apt-cdrom +++ b/test/integration/test-apt-cdrom @@ -112,7 +112,7 @@ Conf testing:i386 (0.8.15 stable [i386])' aptget install testing:i386 -s rm -f testing_0.8.15_amd64.deb rm -f testing_0.8.15.dsc - testsuccess aptget source testing --dsc-only -d + testsuccess aptget source testing --dsc-only testsuccess test -s testing_0.8.15.dsc rm -f testing_0.8.15.dsc cd - >/dev/null diff --git a/test/integration/test-apt-cli-update b/test/integration/test-apt-cli-update index b423072c3..cc8d051d2 100755 --- a/test/integration/test-apt-cli-update +++ b/test/integration/test-apt-cli-update @@ -15,6 +15,7 @@ setupaptarchive --no-update testfailuremsg 'E: The update command takes no arguments' apt update arguments +testempty apt update -qq -o pkgCacheFile::Generate=false testsuccessequal "1 package can be upgraded. Run 'apt list --upgradable' to see it." apt update -qq cp dpkg.status rootdir/var/lib/dpkg/status diff --git a/test/integration/test-apt-ftparchive-by-hash b/test/integration/test-apt-ftparchive-by-hash index 75fb0cf2c..ccfc62734 100755 --- a/test/integration/test-apt-ftparchive-by-hash +++ b/test/integration/test-apt-ftparchive-by-hash @@ -23,7 +23,7 @@ confighashes 'SHA256' 'SHA512' # enable by-hash in apt-ftparchive echo 'APT::FTPArchive::DoByHash "1";' >> aptconfig.conf -# build one pacakge +# build one package buildsimplenativepackage 'foo' 'i386' '1' 'unstable' buildaptarchivefromincoming diff --git a/test/integration/test-apt-ftparchive-cachedb b/test/integration/test-apt-ftparchive-cachedb index 1a06ff343..73d762cc8 100755 --- a/test/integration/test-apt-ftparchive-cachedb +++ b/test/integration/test-apt-ftparchive-cachedb @@ -64,7 +64,7 @@ Tree "dists/test" { }; EOF -# build one pacakge +# build one package buildsimplenativepackage 'foo' 'i386' '1' 'test' mv incoming/* aptarchive/pool/main/ diff --git a/test/integration/test-apt-ftparchive-cachedb-lp1274466 b/test/integration/test-apt-ftparchive-cachedb-lp1274466 index 3a5527230..b0bcae8ec 100755 --- a/test/integration/test-apt-ftparchive-cachedb-lp1274466 +++ b/test/integration/test-apt-ftparchive-cachedb-lp1274466 @@ -16,7 +16,7 @@ if command -v db_dump-5 >/dev/null 2>&1; then db_dump=db_dump-5 fi -# gather the db and the deb, ensure mtime is not modfied as its saved in the DB +# gather the db and the deb, ensure mtime is not modified as its saved in the DB cp -p "$TESTDIR/deb-lp1274466-cachedb.deb" foo_1_i386.deb cp -p "$TESTDIR/cachedb-lp1274466-old-format.db" old-format.db diff --git a/test/integration/test-apt-get-autoremove b/test/integration/test-apt-get-autoremove index 8af864acb..6f3452fbd 100755 --- a/test/integration/test-apt-get-autoremove +++ b/test/integration/test-apt-get-autoremove @@ -46,6 +46,47 @@ Reading state information... 1 package was automatically installed and is no longer required. Use '$AUTOREMOVE' to remove it. 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -s -o APT::Get::HideAutoRemove=small +testequal "Reading package lists... +Building dependency tree... +Reading state information... +Calculating upgrade... +The following package was automatically installed and is no longer required: + po-debconf +Use '$AUTOREMOVE' to remove it. +0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget upgrade -s +testsuccessequal 'Reading package lists... +Building dependency tree... +Reading state information... +The following packages will be REMOVED: + po-debconf +0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded. +Remv po-debconf [1.0.16]' aptget install -s --autoremove +testsuccessequal 'Reading package lists... +Building dependency tree... +Reading state information... +Calculating upgrade... +The following packages will be REMOVED: + po-debconf +0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded. +Remv po-debconf [1.0.16]' aptget upgrade -s --autoremove +echo 'APT::Get::AutomaticRemove "true";' > rootdir/etc/apt/apt.conf.d/autoremoval +testsuccessequal 'Reading package lists... +Building dependency tree... +Reading state information... +The following packages will be REMOVED: + po-debconf +0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded. +Remv po-debconf [1.0.16]' aptget install -s +testequal "Reading package lists... +Building dependency tree... +Reading state information... +Calculating upgrade... +The following package was automatically installed and is no longer required: + po-debconf +Use '$AUTOREMOVE' to remove it. +0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget upgrade -s +rm -f rootdir/etc/apt/apt.conf.d/autoremoval + testdpkginstalled 'po-debconf' echo 'APT::NeverAutoRemove { "^po-debconf$"; };' > rootdir/etc/apt/apt.conf.d/00autoremove diff --git a/test/integration/test-apt-get-build-dep b/test/integration/test-apt-get-build-dep index 6a3a2b6c2..403de8f35 100755 --- a/test/integration/test-apt-get-build-dep +++ b/test/integration/test-apt-get-build-dep @@ -8,6 +8,7 @@ setupenvironment configarchitecture 'i386' insertpackage 'stable' 'build-essential' 'i386' '1' +insertpackage 'stable' 'build-essential2' 'i386' '1' insertpackage 'stable' 'build-depends' 'i386' '1' insertpackage 'stable' 'build-depends-arch' 'i386' '1' insertpackage 'stable' 'build-depends-indep' 'i386' '1' @@ -56,6 +57,67 @@ testsuccessequal "Note, using file './foobar.dsc' to get the build dependencies Reading package lists... Building dependency tree... The following packages will be REMOVED: + build-conflicts build-conflicts-arch build-conflicts-indep +The following NEW packages will be installed: + build-depends build-depends-arch build-depends-indep build-essential2 +0 upgraded, 4 newly installed, 3 to remove and 0 not upgraded. +Remv build-conflicts [1] +Remv build-conflicts-arch [1] +Remv build-conflicts-indep [1] +Inst build-depends (1 stable [i386]) +Inst build-depends-arch (1 stable [i386]) +Inst build-depends-indep (1 stable [i386]) +Inst build-essential2 (1 stable [i386]) +Conf build-depends (1 stable [i386]) +Conf build-depends-arch (1 stable [i386]) +Conf build-depends-indep (1 stable [i386]) +Conf build-essential2 (1 stable [i386])" aptget build-dep --simulate ./foobar.dsc -o APT::Build-Essential="build-essential2" + +testsuccessequal "Note, using file './foobar.dsc' to get the build dependencies +Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + build-conflicts build-conflicts-arch build-conflicts-indep +The following NEW packages will be installed: + build-depends build-depends-arch build-depends-indep +0 upgraded, 3 newly installed, 3 to remove and 0 not upgraded. +Remv build-conflicts [1] +Remv build-conflicts-arch [1] +Remv build-conflicts-indep [1] +Inst build-depends (1 stable [i386]) +Inst build-depends-arch (1 stable [i386]) +Inst build-depends-indep (1 stable [i386]) +Conf build-depends (1 stable [i386]) +Conf build-depends-arch (1 stable [i386]) +Conf build-depends-indep (1 stable [i386])" aptget build-dep --simulate ./foobar.dsc -o APT::Build-Essential="," + +testsuccessequal "Note, using file './foobar.dsc' to get the build dependencies +Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + build-conflicts build-conflicts-arch build-conflicts-indep +The following NEW packages will be installed: + build-depends build-depends-arch build-depends-indep build-essential + build-essential2 +0 upgraded, 5 newly installed, 3 to remove and 0 not upgraded. +Remv build-conflicts [1] +Remv build-conflicts-arch [1] +Remv build-conflicts-indep [1] +Inst build-depends (1 stable [i386]) +Inst build-depends-arch (1 stable [i386]) +Inst build-depends-indep (1 stable [i386]) +Inst build-essential (1 stable [i386]) +Inst build-essential2 (1 stable [i386]) +Conf build-depends (1 stable [i386]) +Conf build-depends-arch (1 stable [i386]) +Conf build-depends-indep (1 stable [i386]) +Conf build-essential (1 stable [i386]) +Conf build-essential2 (1 stable [i386])" aptget build-dep --simulate ./foobar.dsc -o APT::Build-Essential::="build-essential2" + +testsuccessequal "Note, using file './foobar.dsc' to get the build dependencies +Reading package lists... +Building dependency tree... +The following packages will be REMOVED: build-conflicts build-conflicts-arch The following NEW packages will be installed: build-depends build-depends-arch build-essential @@ -68,3 +130,20 @@ Inst build-essential (1 stable [i386]) Conf build-depends (1 stable [i386]) Conf build-depends-arch (1 stable [i386]) Conf build-essential (1 stable [i386])" aptget build-dep --simulate ./foobar.dsc --arch-only + +testsuccessequal "Note, using file './foobar.dsc' to get the build dependencies +Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + build-conflicts build-conflicts-indep +The following NEW packages will be installed: + build-depends build-depends-indep build-essential +0 upgraded, 3 newly installed, 2 to remove and 0 not upgraded. +Remv build-conflicts [1] +Remv build-conflicts-indep [1] +Inst build-depends (1 stable [i386]) +Inst build-depends-indep (1 stable [i386]) +Inst build-essential (1 stable [i386]) +Conf build-depends (1 stable [i386]) +Conf build-depends-indep (1 stable [i386]) +Conf build-essential (1 stable [i386])" aptget build-dep --simulate ./foobar.dsc --indep-only diff --git a/test/integration/test-apt-get-build-dep-file b/test/integration/test-apt-get-build-dep-file index ed850fa40..07de8bb30 100755 --- a/test/integration/test-apt-get-build-dep-file +++ b/test/integration/test-apt-get-build-dep-file @@ -39,7 +39,8 @@ Files: EOF test2vcardbuilddep() { - testsuccessequal "Note, using file './2vcard_0.5-3.dsc' to get the build dependencies + local name="$1" + testsuccessequal "Note, using file './$name' to get the build dependencies Reading package lists... Building dependency tree... The following packages will be REMOVED: @@ -51,14 +52,16 @@ Remv build-conflict [1] Inst build-essential (1 stable [i386]) Inst debhelper (7 stable [i386]) Conf build-essential (1 stable [i386]) -Conf debhelper (7 stable [i386])" aptget build-dep -s ./2vcard_0.5-3.dsc -testfailure aptget build-dep --simulate 2vcard_0.5-3.dsc +Conf debhelper (7 stable [i386])" aptget build-dep -s ./$name +testfailure aptget build-dep --simulate $name cd downloaded -testsuccess aptget build-dep --simulate ../2vcard_0.5-3.dsc -testsuccess aptget build-dep --simulate "$(readlink -f ../2vcard_0.5-3.dsc)" +testsuccess aptget build-dep --simulate ../$name +testsuccess aptget build-dep --simulate "$(readlink -f ../$name)" cd .. } -test2vcardbuilddep +test2vcardbuilddep "2vcard_0.5-3.dsc" +cp "2vcard_0.5-3.dsc" "2VCard_0.5-3.dsc" +test2vcardbuilddep "2VCard_0.5-3.dsc" msgmsg 'Test with' 'signed dsc' cat > 2vcard_0.5-3.dsc <<EOF @@ -93,7 +96,9 @@ z2UAn1oXgTai6opwhVfkxrlmJ+iRxzuc =4eRd -----END PGP SIGNATURE----- EOF -test2vcardbuilddep +test2vcardbuilddep "2vcard_0.5-3.dsc" +cp "2vcard_0.5-3.dsc" "2VCard_0.5-3.dsc" +test2vcardbuilddep "2VCard_0.5-3.dsc" msgmsg 'Test with' 'unpacked source dir' diff --git a/test/integration/test-apt-keep-downloaded-pkgs b/test/integration/test-apt-keep-downloaded-pkgs index 4cc7fbb04..c5f62954c 100755 --- a/test/integration/test-apt-keep-downloaded-pkgs +++ b/test/integration/test-apt-keep-downloaded-pkgs @@ -15,14 +15,25 @@ buildsimplenativepackage 'pkg4' 'all' '1.0' 'stable' # local (file) installs setupaptarchive +# a file:// "download" is not a real download and hence passes +testsuccess aptget install pkg1 --no-download --download-only -y +testfailure test -f rootdir/var/cache/apt/archives/pkg1_1.0_all.deb +testsuccess test -f aptarchive/pool/pkg1_1.0_all.deb + # ensure that install from local sources does not remove debs testsuccess aptget install pkg1 -o APT::Keep-Downloaded-Packages=false testsuccess test -f aptarchive/pool/pkg1_1.0_all.deb +testfailure test -f rootdir/var/cache/apt/archives/pkg1_1.0_all.deb # now switch to http and downloading debs changetowebserver testsuccess aptget update +# see if no-download really doesn't download the package +testfailuremsg 'E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?' aptget install pkg2 --no-download -y +testsuccess test -f aptarchive/pool/pkg2_1.0_all.deb +testfailure test -f rootdir/var/cache/apt/archives/pkg2_1.0_all.deb + # ensure that the downloaded pkg is kept with "keep=true" testsuccess aptget install pkg2 -o APT::Keep-Downloaded-Packages=true testsuccess test -f aptarchive/pool/pkg2_1.0_all.deb @@ -40,4 +51,4 @@ testfailure test -f rootdir/var/cache/apt/archives/pkg3_1.0_all.deb # ensure that install from the download dir does not delete packages mv aptarchive/pool/pkg4_1.0_all.deb rootdir/var/cache/apt/archives testsuccess aptget install $(pwd)/rootdir/var/cache/apt/archives/pkg4_1.0_all.deb -o APT::Keep-Downloaded-Packages=false -testsuccess test -f $(pwd)/rootdir/var/cache/apt/archives/pkg4_1.0_all.deb
\ No newline at end of file +testsuccess test -f $(pwd)/rootdir/var/cache/apt/archives/pkg4_1.0_all.deb diff --git a/test/integration/test-apt-source-and-build-dep b/test/integration/test-apt-source-and-build-dep index 5fa87d57d..7f7457217 100755 --- a/test/integration/test-apt-source-and-build-dep +++ b/test/integration/test-apt-source-and-build-dep @@ -28,7 +28,7 @@ insertsource 'stable' 'foo' 'all' '0.5' insertpackage 'stable' 'foo' 'all' '1.0' insertsource 'stable' 'foo' 'all' '1.0' -# this packages exists only as sources, add two versions to ensure that +# these packages exists only as sources, add two versions to ensure that # apt will pick the higher version number (bts #731853) insertsource 'wheezy' 'foo' 'all' '0.0.1' insertsource 'wheezy' 'foo' 'all' '0.1' diff --git a/test/integration/test-apt-update-expected-size b/test/integration/test-apt-update-expected-size index f7b825d98..710d05d18 100755 --- a/test/integration/test-apt-update-expected-size +++ b/test/integration/test-apt-update-expected-size @@ -25,6 +25,7 @@ test_inreleasetoobig() { rm -f update.output # ensure the failed InRelease file got renamed testsuccess ls rootdir/var/lib/apt/lists/partial/*InRelease.FAILED + testfailure test -e rootdir/var/lib/apt/lists/partial/Old.FAILED } test_packagestoobig() { @@ -40,6 +41,8 @@ test_packagestoobig() { NEW_SIZE="$(stat --printf=%s aptarchive/dists/unstable/main/binary-i386/Packages.gz)" testfailuremsg "E: Failed to fetch ${1}/dists/unstable/main/binary-i386/Packages.gz Writing more data than expected ($NEW_SIZE > $SIZE) E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::Transaction=0 + testsuccess ls rootdir/var/lib/apt/lists/partial/*Packages*.FAILED + testfailure test -e rootdir/var/lib/apt/lists/partial/Old.FAILED } methodtest() { @@ -51,6 +54,7 @@ methodtest() { rm -rf rootdir/var/lib/apt/lists rootdir/var/lib/apt/lists.good # normal update works fine testsuccess aptget update + touch rootdir/var/lib/apt/lists/partial/Old.FAILED mv rootdir/var/lib/apt/lists rootdir/var/lib/apt/lists.good # starting fresh works diff --git a/test/integration/test-bug-632221-cross-dependency-satisfaction b/test/integration/test-bug-632221-cross-dependency-satisfaction index 066e29d99..d52652cad 100755 --- a/test/integration/test-bug-632221-cross-dependency-satisfaction +++ b/test/integration/test-bug-632221-cross-dependency-satisfaction @@ -21,7 +21,7 @@ insertpackage 'unstable' 'foreigner' 'amd64,armel' '1.0' 'Multi-Arch: foreign' insertpackage 'unstable' 'arm-stuff' 'armel' '1.0' insertpackage 'unstable' 'linux-stuff' 'amd64,armel' '1.0' -insertsource 'unstable' 'apt' 'any' '0.8.15' 'Build-Depends: doxygen, libc6-dev, libc6-dev:native, cool:any, amdboot:amd64, foreigner, libfwibble-dev, arm-stuff [any-armel] | linux-stuff [ linux-any]' +insertsource 'unstable' 'apt' 'any' '0.8.15' 'Build-Depends: doxygen, libc6-dev, libc6-dev:native, cool:any, amdboot:amd64, foreigner, libfwibble-dev, arm-stuff [eabi-any-any-arm gnueabi-any-arm] | linux-stuff [ linux-any]' insertsource 'unstable' 'forbidden-no' 'any' '1' 'Build-Depends: amdboot:any' insertsource 'unstable' 'forbidden-same' 'any' '1' 'Build-Depends: libc6:any' diff --git a/test/integration/test-bug-686346-package-missing-architecture b/test/integration/test-bug-686346-package-missing-architecture index 8f9536a09..d28600a4f 100755 --- a/test/integration/test-bug-686346-package-missing-architecture +++ b/test/integration/test-bug-686346-package-missing-architecture @@ -69,7 +69,7 @@ insertinstalledpackage 'pkgb' 'amd64' '2' testequalor2 "Reading package lists... Building dependency tree... Reading state information... -You might want to run 'apt-get -f install' to correct these. +You might want to run 'apt --fix-broken install' to correct these. The following packages have unmet dependencies: pkgb : Conflicts: pkgb:none but 1 is installed pkgb:none : Conflicts: pkgb but 2 is installed @@ -77,10 +77,10 @@ The following packages have unmet dependencies: Conflicts: pkgb but 2 is installed pkgg : Conflicts: pkgb but 2 is installed Conflicts: pkgb:none but 1 is installed -E: Unmet dependencies. Try using -f." "Reading package lists... +E: Unmet dependencies. Try using --fix-broken." "Reading package lists... Building dependency tree... Reading state information... -You might want to run 'apt-get -f install' to correct these. +You might want to run 'apt --fix-broken install' to correct these. The following packages have unmet dependencies: pkgb : Conflicts: pkgb:none but 1 is installed pkgb:none : Conflicts: pkgb but 2 is installed @@ -88,7 +88,7 @@ The following packages have unmet dependencies: Conflicts: pkgb:none but 1 is installed pkgg : Conflicts: pkgb but 2 is installed Conflicts: pkgb:none but 1 is installed -E: Unmet dependencies. Try using -f." aptget check +E: Unmet dependencies. Try 'apt --fix-broken install' with no packages (or specify a solution)." aptget check # check that dependencies are generated for none-packages rm rootdir/var/lib/dpkg/status diff --git a/test/integration/test-bug-738785-switch-protocol b/test/integration/test-bug-738785-switch-protocol index 690e8727e..471d12e53 100755 --- a/test/integration/test-bug-738785-switch-protocol +++ b/test/integration/test-bug-738785-switch-protocol @@ -47,4 +47,4 @@ cd - >/dev/null # check that downgrades from https to http are not allowed webserverconfig 'aptwebserver::support::http' 'true' sed -i -e "s#:${APTHTTPPORT}/redirectme#:${APTHTTPSPORT}/downgrademe#" -e 's# http:# https:#' rootdir/etc/apt/sources.list.d/* -testfailure aptget update --allow-insecure-repositories -o Acquire::https::Timeout=1 +testfailure aptget update --allow-insecure-repositories -o Acquire::https::Timeout=1 -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::https=1 diff --git a/test/integration/test-bug-770291-reinstall b/test/integration/test-bug-770291-reinstall index 389fb1814..a1caf25f8 100755 --- a/test/integration/test-bug-770291-reinstall +++ b/test/integration/test-bug-770291-reinstall @@ -56,7 +56,7 @@ Conf dependsb (1 unstable [i386]) Conf dependsa (1 unstable [i386])' aptget install --reinstall dependsa dependsb -s # there is a chance dpkg can actually do these, BUT this depends on the maintainerscripts (not) present -# which is very very risky to depend on (and apt doesn't know about that anyhow). +# which is very risky to depend on (and apt doesn't know about that anyhow). testfailure aptget install --reinstall predependsa predependsb -s -o Debug::pkgPackageManager=1 testsuccess grep "^E: Couldn't configure predependsa:i386, probably a dependency cycle.$" rootdir/tmp/testfailure.output @@ -89,7 +89,7 @@ Conf dependsb (1 unstable [i386]) Conf dependsa (1 unstable [i386])' aptget install dependsa dependsb -s # there is a chance dpkg can actually do these, BUT this depends on the maintainerscripts (not) present -# which is very very risky to depend on (and apt doesn't know about that anyhow). +# which is very risky to depend on (and apt doesn't know about that anyhow). testfailure aptget install predependsa predependsb -s -o Debug::pkgPackageManager=1 testsuccess grep "^E: Couldn't configure predependsa:i386, probably a dependency cycle.$" rootdir/tmp/testfailure.output diff --git a/test/integration/test-bug-lp1694697-build-dep-architecture-limited-alternative b/test/integration/test-bug-lp1694697-build-dep-architecture-limited-alternative new file mode 100755 index 000000000..7f8e4ad3d --- /dev/null +++ b/test/integration/test-bug-lp1694697-build-dep-architecture-limited-alternative @@ -0,0 +1,58 @@ +#!/bin/sh +set -e + +TESTDIR="$(readlink -f "$(dirname "$0")")" +. "$TESTDIR/framework" + +setupenvironment +configarchitecture 'i386' + + +insertpackage 'stable' 'build-depends' 'i386' '1' +insertpackage 'stable' 'foo' 'i386' '1' +insertinstalledpackage 'build-essential' 'i386' '1' + +setupaptarchive + +# This used to be interpreted as build-depends | foo +cat > foobar.dsc <<EOF +Format: 3.0 (native) +Source: foobar +Binary: foobar +Architecture: all +Version: 1 +Maintainer: Joe Sixpack <joe@example.org> +Build-Depends: build-depends [i386] | build-depends [amd64], foo +Standards-Version: 3.9.8 +EOF +testsuccessequal "Note, using file './foobar.dsc' to get the build dependencies +Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + build-depends foo +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst build-depends (1 stable [i386]) +Inst foo (1 stable [i386]) +Conf build-depends (1 stable [i386]) +Conf foo (1 stable [i386])" aptget build-dep --simulate ./foobar.dsc + + +# This caused a segmentation fault +cat > foobar.dsc <<EOF +Format: 3.0 (native) +Source: foobar +Binary: foobar +Architecture: all +Version: 1 +Maintainer: Joe Sixpack <joe@example.org> +Build-Depends: build-depends [i386] | build-depends [amd64] +Standards-Version: 3.9.8 +EOF +testsuccessequal "Note, using file './foobar.dsc' to get the build dependencies +Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + build-depends +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst build-depends (1 stable [i386]) +Conf build-depends (1 stable [i386])" aptget build-dep --simulate ./foobar.dsc diff --git a/test/integration/test-cve-2013-1051-InRelease-parsing b/test/integration/test-cve-2013-1051-InRelease-parsing index 3cc012e35..6238057c3 100755 --- a/test/integration/test-cve-2013-1051-InRelease-parsing +++ b/test/integration/test-cve-2013-1051-InRelease-parsing @@ -45,8 +45,10 @@ touch -d '+1hour' aptarchive/dists/stable/InRelease # part of the InRelease listcurrentlistsdirectory | sed '/_InRelease/ d' > listsdir.lst msgtest 'apt-get update should ignore unsigned data in the' 'InRelease' -testsuccessequal "Get:1 http://localhost:${APTHTTPPORT} stable InRelease [$(stat -c%s aptarchive/dists/stable/InRelease) B] -Reading package lists..." --nomsg aptget update +testwarningequal "Get:1 http://localhost:${APTHTTPPORT} stable InRelease [$(stat -c%s aptarchive/dists/stable/InRelease) B] +Reading package lists... +W: Clearsigned file '${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial/localhost:${APTHTTPPORT}_dists_stable_InRelease' contains unsigned lines. +W: Clearsigned file '${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/localhost:${APTHTTPPORT}_dists_stable_InRelease' contains unsigned lines." --nomsg aptget update testfileequal './listsdir.lst' "$(listcurrentlistsdirectory | sed '/_InRelease/ d')" # ensure there is no package diff --git a/test/integration/test-external-dependency-solver-protocol b/test/integration/test-external-dependency-solver-protocol index d126cd84b..2c451d5f9 100755 --- a/test/integration/test-external-dependency-solver-protocol +++ b/test/integration/test-external-dependency-solver-protocol @@ -148,7 +148,16 @@ testsuccess aptget upgrade -s --solver apt testfailure aptget install awesome badstuff -s testfailure aptget install awesome badstuff -s --solver apt testsuccess grep 'ERR_UNSOLVABLE' rootdir/tmp/testfailure.output - +msgtest 'A resolving error is format as' 'valid parseable EDSP error' +if dpkg-checkbuilddeps -d 'dctrl-tools' /dev/null >/dev/null 2>&1; then + if apthelper cat-file rootdir/var/log/apt/edsp.last.xz | aptinternalsolver > solver.result 2>&1; then + testsuccess --nomsg grep-dctrl -FError ERR -- solver.result + else + msgfail + fi +else + msgskip 'dctrl-tools not installed' +fi configarchitecture 'armel' testfailure aptget install --solver apt awesomecoolstuff:i386 -s msgtest 'An invalid EDSP file generates a' 'hard error' diff --git a/test/integration/test-parse-all-archs-into-cache b/test/integration/test-parse-all-archs-into-cache index 65222f0fe..7485431db 100755 --- a/test/integration/test-parse-all-archs-into-cache +++ b/test/integration/test-parse-all-archs-into-cache @@ -22,10 +22,10 @@ setupaptarchive testfailureequal "Reading package lists... Building dependency tree... -You might want to run 'apt-get -f install' to correct these. +You might want to run 'apt --fix-broken install' to correct these. The following packages have unmet dependencies: foo:amd64 : Depends: libfoo1:amd64 but it is not installable -E: Unmet dependencies. Try using -f." aptget check -s +E: Unmet dependencies. Try 'apt --fix-broken install' with no packages (or specify a solution)." aptget check -s insertinstalledpackage 'libfoo1' 'amd64' '1' 'Multi-Arch: same' diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index 59a3fd8af..430551fa4 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -210,7 +210,7 @@ Filename: pool/futurestuff_1.0_i386.deb Size: 202200 SHA256: b46fd154615edaae5ba33c56a5cc0e7deaef23e2da3e4f129727fd660f28f050 Description: some cool and shiny future stuff - This package will appear in the next next mirror update + This package will appear in the next^2 mirror update Description-md5: d5f89fbbc2ce34c455dfee9b67d82b6b' >> aptarchive/Packages compressfile 'aptarchive/Packages' diff --git a/test/integration/test-releasefile-valid-until b/test/integration/test-releasefile-valid-until index f64c6329d..b18dde2b6 100755 --- a/test/integration/test-releasefile-valid-until +++ b/test/integration/test-releasefile-valid-until @@ -48,7 +48,7 @@ runtest 'rejected' 'bad Max-Valid (bad Until, bad Min-Valid) <' 'now - 7 days' ' runtest 'rejected' 'bad Max-Valid (bad Until, bad Min-Valid) >' 'now - 7 days' 'now - 2 days' -o Acquire::Max-ValidTime=12096 -o Acquire::Min-ValidTime=241920 sed -i -e 's#\(deb\(-src\)\?\) #\1 [check-valid-until=no] #' rootdir/etc/apt/sources.list.d/* -runtest 'accepted' 'bad Until but overriden by sources option' 'now - 7 days' 'now - 4 days' +runtest 'accepted' 'bad Until but overridden by sources option' 'now - 7 days' 'now - 4 days' sed -i -e 's#\(deb\(-src\)\?\) \[check-valid-until=no\] #\1 [valid-until-max=86400] #' rootdir/etc/apt/sources.list.d/* runtest 'rejected' 'bad Max-Valid (good Until) via sources option' 'now - 7 days' 'now + 4 days' diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification index e043fa8b5..36a90f9d5 100755 --- a/test/integration/test-releasefile-verification +++ b/test/integration/test-releasefile-verification @@ -383,7 +383,7 @@ runtest3() { done } -# diable some protection by default and ensure we still do the verification +# disable some protection by default and ensure we still do the verification # correctly cat > rootdir/etc/apt/apt.conf.d/weaken-security <<EOF Acquire::AllowInsecureRepositories "1"; diff --git a/test/integration/test-sourceslist-trusted-options b/test/integration/test-sourceslist-trusted-options index 94de11ef7..1eee3b09a 100755 --- a/test/integration/test-sourceslist-trusted-options +++ b/test/integration/test-sourceslist-trusted-options @@ -26,7 +26,7 @@ foo/stable 1 amd64 testsuccess test -s foo_1_amd64.deb -o -s foo_2_amd64.deb rm -f foo_1.dsc foo_2.dsc - testsuccess aptget source foo --dsc-only -d "$@" + testsuccess aptget source foo --dsc-only "$@" testsuccess test -s foo_1.dsc -o -s foo_2.dsc cd - >/dev/null } @@ -48,7 +48,7 @@ E: Some packages could not be authenticated' testfailure test -s foo_1_amd64.deb -o -s foo_2_amd64.deb rm -f foo_1.dsc foo_2.dsc - testfailure aptget source foo --dsc-only -d "$@" + testfailure aptget source foo --dsc-only "$@" testequal "$WARNING" tail -n 3 ../rootdir/tmp/testfailure.output testfailure test -s foo_1.dsc -o -s foo_2.dsc cd - >/dev/null diff --git a/test/integration/test-ubuntu-bug-1651923-requote-https-uri b/test/integration/test-ubuntu-bug-1651923-requote-https-uri new file mode 100755 index 000000000..cf56a6af4 --- /dev/null +++ b/test/integration/test-ubuntu-bug-1651923-requote-https-uri @@ -0,0 +1,19 @@ +#!/bin/sh +set -e + +TESTDIR="$(readlink -f "$(dirname "$0")")" +. "$TESTDIR/framework" + +setupenvironment +configarchitecture "i386" + +mkdir "aptarchive/target with space" +echo 'alright' > "aptarchive/target with space/working" +changetohttpswebserver +webserverconfig 'aptwebserver::redirect::replace::/targetwithoutspace/' '/target%20with%20space/' +webserverconfig 'aptwebserver::redirect::replace::/targetwithoutspace2/' '/target with space/' + +testsuccess downloadfile "http://localhost:${APTHTTPPORT}/targetwithoutspace/working" httpfile1 +testsuccess downloadfile "http://localhost:${APTHTTPPORT}/targetwithoutspace2/working" httpfile2 +testsuccess downloadfile "https://localhost:${APTHTTPSPORT}/targetwithoutspace/working" httpsfile1 +testsuccess downloadfile "https://localhost:${APTHTTPSPORT}/targetwithoutspace2/working" httpsfile2 diff --git a/test/libapt/CMakeLists.txt b/test/libapt/CMakeLists.txt index f7cd5b2f6..86c0b28b5 100644 --- a/test/libapt/CMakeLists.txt +++ b/test/libapt/CMakeLists.txt @@ -22,6 +22,9 @@ if(NOT GTEST_FOUND AND EXISTS ${GTEST_ROOT}) endif() if(GTEST_FOUND) + # Definition of the C++ files used to build the test binary - note that this + # is expanded at CMake time, so you have to rerun cmake if you add or remove + # a file (you can just run cmake . in the build directory) file(GLOB files gtest_runner.cc *-helpers.cc *_test.cc) add_executable(libapt_test ${files}) target_include_directories(libapt_test PRIVATE ${GTEST_INCLUDE_DIRS}) diff --git a/test/libapt/cachefilter_test.cc b/test/libapt/cachefilter_test.cc index 28924b758..08812e0dc 100644 --- a/test/libapt/cachefilter_test.cc +++ b/test/libapt/cachefilter_test.cc @@ -1,6 +1,7 @@ #include <config.h> #include <apt-pkg/cachefilter.h> +#include <apt-pkg/fileutl.h> #include <string> @@ -9,17 +10,22 @@ TEST(CacheFilterTest, ArchitectureSpecification) { { - SCOPED_TRACE("Pattern is any-armhf"); - APT::CacheFilter::PackageArchitectureMatchesSpecification ams("any-armhf"); - EXPECT_TRUE(ams("armhf")); - EXPECT_FALSE(ams("armel")); - EXPECT_TRUE(ams("linux-armhf")); - EXPECT_FALSE(ams("linux-armel")); - EXPECT_TRUE(ams("kfreebsd-armhf")); - EXPECT_TRUE(ams("gnu-linux-armhf")); - EXPECT_FALSE(ams("gnu-linux-armel")); - EXPECT_TRUE(ams("gnu-kfreebsd-armhf")); - EXPECT_TRUE(ams("musl-linux-armhf")); + SCOPED_TRACE("Pattern is *"); + // * should be treated like any + APT::CacheFilter::PackageArchitectureMatchesSpecification ams("*"); + EXPECT_TRUE(ams("sparc")); + EXPECT_TRUE(ams("amd64")); + EXPECT_TRUE(ams("kfreebsd-amd64")); + } + { + SCOPED_TRACE("Pattern is any-i386"); + APT::CacheFilter::PackageArchitectureMatchesSpecification ams("any-i386"); + EXPECT_TRUE(ams("i386")); + EXPECT_FALSE(ams("amd64")); + EXPECT_TRUE(ams("linux-i386")); + EXPECT_FALSE(ams("linux-amd64")); + EXPECT_TRUE(ams("kfreebsd-i386")); + EXPECT_TRUE(ams("musl-linux-i386")); } { SCOPED_TRACE("Pattern is linux-any"); @@ -29,11 +35,9 @@ TEST(CacheFilterTest, ArchitectureSpecification) EXPECT_TRUE(ams("linux-armhf")); EXPECT_TRUE(ams("linux-armel")); EXPECT_FALSE(ams("kfreebsd-armhf")); - EXPECT_TRUE(ams("gnu-linux-armhf")); - EXPECT_TRUE(ams("gnu-linux-armel")); - EXPECT_FALSE(ams("gnu-kfreebsd-armhf")); EXPECT_TRUE(ams("musl-linux-armhf")); } + if (FileExists(DPKG_DATADIR "/tupletable")) { SCOPED_TRACE("Pattern is gnu-any-any"); APT::CacheFilter::PackageArchitectureMatchesSpecification ams("gnu-any-any"); //really? @@ -42,11 +46,32 @@ TEST(CacheFilterTest, ArchitectureSpecification) EXPECT_TRUE(ams("linux-armhf")); EXPECT_TRUE(ams("linux-armel")); EXPECT_TRUE(ams("kfreebsd-armhf")); - EXPECT_TRUE(ams("gnu-linux-armhf")); - EXPECT_TRUE(ams("gnu-linux-armel")); - EXPECT_TRUE(ams("gnu-kfreebsd-armhf")); EXPECT_FALSE(ams("musl-linux-armhf")); } + if (FileExists(DPKG_DATADIR "/triplettable")) + { + SCOPED_TRACE("Pattern is gnueabi-any-any"); + APT::CacheFilter::PackageArchitectureMatchesSpecification ams("gnueabi-any-any"); //really? + EXPECT_TRUE(ams("linux-armel")); + EXPECT_TRUE(ams("armel")); + EXPECT_FALSE(ams("armhf")); + EXPECT_FALSE(ams("linux-armhf")); + EXPECT_FALSE(ams("musleabihf-linux-armhf")); + } + if (FileExists(DPKG_DATADIR "/triplettable")) + { + SCOPED_TRACE("Pattern is gnueabihf-any-any"); + APT::CacheFilter::PackageArchitectureMatchesSpecification ams("gnueabihf-any-any"); //really? + EXPECT_FALSE(ams("linux-armel")); + EXPECT_FALSE(ams("armel")); + EXPECT_TRUE(ams("armhf")); + EXPECT_TRUE(ams("linux-armhf")); + EXPECT_FALSE(ams("musleabihf-linux-armhf")); + } + + // Weird ones - armhf's tuple is actually eabihf-gnu-linux-arm + // armel's tuple is actually eabi-gnu-linux-arm + // x32's tuple is actually x32-gnu-linux-amd64 { SCOPED_TRACE("Architecture is armhf"); APT::CacheFilter::PackageArchitectureMatchesSpecification ams("armhf", false); @@ -54,13 +79,41 @@ TEST(CacheFilterTest, ArchitectureSpecification) EXPECT_FALSE(ams("armel")); EXPECT_TRUE(ams("linux-any")); EXPECT_FALSE(ams("kfreebsd-any")); - EXPECT_TRUE(ams("any-armhf")); - EXPECT_FALSE(ams("any-armel")); + EXPECT_TRUE(ams("any-arm")); EXPECT_TRUE(ams("linux-armhf")); EXPECT_FALSE(ams("kfreebsd-armhf")); - EXPECT_TRUE(ams("gnu-linux-armhf")); - EXPECT_FALSE(ams("gnu-linux-armel")); - EXPECT_FALSE(ams("gnu-kfreebsd-armhf")); EXPECT_FALSE(ams("musl-linux-armhf")); } + { + SCOPED_TRACE("Pattern is any-arm"); + APT::CacheFilter::PackageArchitectureMatchesSpecification ams("any-arm"); + EXPECT_TRUE(ams("armhf")); + EXPECT_TRUE(ams("armel")); + EXPECT_TRUE(ams("linux-armhf")); + EXPECT_TRUE(ams("linux-armel")); + EXPECT_TRUE(ams("musl-linux-armhf")); + EXPECT_TRUE(ams("uclibc-linux-armel")); + + EXPECT_FALSE(ams("arm64")); + EXPECT_FALSE(ams("linux-arm64")); + EXPECT_FALSE(ams("kfreebsd-arm64")); + EXPECT_FALSE(ams("musl-linux-arm64")); + } + { + SCOPED_TRACE("Pattern is any-amd64"); + APT::CacheFilter::PackageArchitectureMatchesSpecification ams("any-amd64"); + EXPECT_TRUE(ams("amd64")); + EXPECT_TRUE(ams("x32")); + EXPECT_TRUE(ams("linux-amd64")); + EXPECT_TRUE(ams("linux-x32")); + EXPECT_TRUE(ams("kfreebsd-amd64")); + EXPECT_TRUE(ams("musl-linux-amd64")); + EXPECT_TRUE(ams("uclibc-linux-amd64")); + + EXPECT_FALSE(ams("i386")); + EXPECT_FALSE(ams("linux-i386")); + EXPECT_FALSE(ams("kfreebsd-i386")); + EXPECT_FALSE(ams("musl-linux-i386")); + EXPECT_FALSE(ams("uclibc-linux-i386")); + } } diff --git a/test/libapt/commandline_test.cc b/test/libapt/commandline_test.cc index 97725c854..1dc9c6946 100644 --- a/test/libapt/commandline_test.cc +++ b/test/libapt/commandline_test.cc @@ -24,8 +24,16 @@ TEST(CommandLineTest,SaveInConfig) "apt-get", "install", "-sf"); APT_EXPECT_CMD("apt-cache -s apt -so Debug::test=Test", "apt-cache", "-s", "apt", "-so", "Debug::test=Test"); - APT_EXPECT_CMD("apt-cache -s apt -so Debug::test=\"Das ist ein Test\"", + APT_EXPECT_CMD("apt-cache -s apt -so Debug::test='Das ist ein Test'", "apt-cache", "-s", "apt", "-so", "Debug::test=Das ist ein Test"); + APT_EXPECT_CMD("apt-cache -s apt -so Debug::test='Das ist ein Test'", + "apt-cache", "-s", "apt", "-so", "Debug::test=\"Das ist ein Test\""); + APT_EXPECT_CMD("apt-cache -s apt -so Debug::test='Das ist ein Test' foo", + "apt-cache", "-s", "apt", "-so", "\"Debug::test=Das ist ein Test\"", "foo"); + APT_EXPECT_CMD("apt-cache -s apt -so Debug::test='Das ist ein Test' foo", + "apt-cache", "-s", "apt", "-so", "\'Debug::test=Das ist ein Test\'", "foo"); + APT_EXPECT_CMD("apt-cache -s apt -so Debug::test='That is crazy!' foo", + "apt-cache", "-s", "apt", "-so", "\'Debug::test=That \ris\n crazy!\'", "foo"); APT_EXPECT_CMD("apt-cache -s apt --hallo test=1.0", "apt-cache", "-s", "apt", "--hallo", "test=1.0"); #undef APT_EXPECT_CMD diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index c50ff6ff8..29ff0c9ae 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -2,6 +2,7 @@ #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> #include <algorithm> @@ -214,6 +215,7 @@ TEST(LanguagesTest,TranslationFiles) EXPECT_EQ(1, vec.size()); EXPECT_EQ("none", vec[0]); + _error->PushToStack(); _config->Set("Acquire::Languages", ""); //FIXME: Remove support for this deprecated setting _config->Set("APT::Acquire::Translation", "ast_DE"); @@ -228,6 +230,11 @@ TEST(LanguagesTest,TranslationFiles) EXPECT_EQ(1, vec.size()); EXPECT_EQ("en", vec[0]); + // discard the deprecation warning for APT::Acquire::Translation + if (_error->PendingError()) + _error->MergeWithStack(); + else + _error->RevertToStack(); EXPECT_EQ(0, system(std::string("rm -rf ").append(tempdir).c_str())); _config->Clear(); diff --git a/test/libapt/getlistoffilesindir_test.cc b/test/libapt/getlistoffilesindir_test.cc index 2369c911a..8c5e56b1d 100644 --- a/test/libapt/getlistoffilesindir_test.cc +++ b/test/libapt/getlistoffilesindir_test.cc @@ -1,6 +1,7 @@ #include <config.h> #include <apt-pkg/fileutl.h> +#include <apt-pkg/error.h> #include <string> #include <vector> @@ -49,6 +50,7 @@ TEST(FileUtlTest,GetListOfFilesInDir) createLink(tempdir, "non-existing-file", "brokenlink.list"); // Files with no extension + _error->PushToStack(); std::vector<std::string> files = GetListOfFilesInDir(tempdir, "", true); ASSERT_EQ(2, files.size()); EXPECT_EQ(P("01yet-anothernormalfile"), files[0]); @@ -103,5 +105,10 @@ TEST(FileUtlTest,GetListOfFilesInDir) EXPECT_EQ(P("disabledfile.disabled"), files[3]); EXPECT_EQ(P("disabledfile.list.disabled"), files[4]); + // discard the unknown file extension messages + if (_error->PendingError()) + _error->MergeWithStack(); + else + _error->RevertToStack(); removeDirectory(tempdir); } diff --git a/test/libapt/openmaybeclearsignedfile_test.cc b/test/libapt/openmaybeclearsignedfile_test.cc new file mode 100644 index 000000000..40735812d --- /dev/null +++ b/test/libapt/openmaybeclearsignedfile_test.cc @@ -0,0 +1,342 @@ +#include <config.h> + +#include <apt-pkg/error.h> +#include <apt-pkg/fileutl.h> +#include <apt-pkg/gpgv.h> + +#include <string> + +#include <gtest/gtest.h> + +#include "file-helpers.h" + +/* The test files are created with the 'Joe Sixpack' and 'Marvin Paranoid' + test key included in the integration testing framework */ + +TEST(OpenMaybeClearSignedFileTest,SimpleSignedFile) +{ + std::string tempfile; + FileFd fd; + // Using c++11 raw-strings would be nifty, but travis doesn't support it… + createTemporaryFile("simplesignedfile", fd, &tempfile, "-----BEGIN PGP SIGNED MESSAGE-----\n" +"Hash: SHA512\n" +"\n" +"Test\n" +"-----BEGIN PGP SIGNATURE-----\n" +"\n" +"iQFEBAEBCgAuFiEENKjp0Y2zIPNn6OqgWpDRQdusja4FAlhT7+kQHGpvZUBleGFt\n" +"cGxlLm9yZwAKCRBakNFB26yNrjvEB/9/e3jA1l0fvPafx9LEXcH8CLpUFQK7ra9l\n" +"3M4YAH4JKQlTG1be7ixruBRlCTh3YiSs66fKMeJeUYoxA2HPhvbGFEjQFAxunEYg\n" +"X/LBKv1mQWa+Q34P5GBjK8kQdLCN+yJAiUErmWNQG3GPninrxsC9tY5jcWvHeP1k\n" +"V7N3MLnNqzXaCJM24mnKidC5IDadUdQ8qC8c3rjUexQ8vBz0eucH56jbqV5oOcvx\n" +"pjlW965dCPIf3OI8q6J7bIOjyY+u/PTcVlqPq3TUz/ti6RkVbKpLH0D4ll3lUTns\n" +"JQt/+gJCPxHUJphy8sccBKhW29CLELJIIafvU30E1nWn9szh2Xjq\n" +"=TB1F\n" +"-----END PGP SIGNATURE-----\n"); + + EXPECT_TRUE(OpenMaybeClearSignedFile(tempfile, fd)); + if (tempfile.empty() == false) + unlink(tempfile.c_str()); + EXPECT_TRUE(fd.IsOpen()); + char buffer[100]; + EXPECT_TRUE(fd.ReadLine(buffer, sizeof(buffer))); + EXPECT_STREQ(buffer, "Test"); + EXPECT_TRUE(fd.Eof()); +} + +TEST(OpenMaybeClearSignedFileTest,WhitespaceSignedFile) +{ + std::string tempfile; + FileFd fd; + // no raw-string here to protect the whitespace from cleanup + createTemporaryFile("simplesignedfile", fd, &tempfile, "-----BEGIN PGP SIGNED MESSAGE----- \t \n" +"Hash: SHA512 \n" +" \n" +"Test \n" +"-----BEGIN PGP SIGNATURE----- \n" +" \n" +"iQFEBAEBCgAuFiEENKjp0Y2zIPNn6OqgWpDRQdusja4FAlhT7+kQHGpvZUBleGFt \n" +"cGxlLm9yZwAKCRBakNFB26yNrjvEB/9/e3jA1l0fvPafx9LEXcH8CLpUFQK7ra9l \n" +"3M4YAH4JKQlTG1be7ixruBRlCTh3YiSs66fKMeJeUYoxA2HPhvbGFEjQFAxunEYg \n" +"X/LBKv1mQWa+Q34P5GBjK8kQdLCN+yJAiUErmWNQG3GPninrxsC9tY5jcWvHeP1k \n" +"V7N3MLnNqzXaCJM24mnKidC5IDadUdQ8qC8c3rjUexQ8vBz0eucH56jbqV5oOcvx \n" +"pjlW965dCPIf3OI8q6J7bIOjyY+u/PTcVlqPq3TUz/ti6RkVbKpLH0D4ll3lUTns \n" +"JQt/+gJCPxHUJphy8sccBKhW29CLELJIIafvU30E1nWn9szh2Xjq \n" +"=TB1F \n" +"-----END PGP SIGNATURE-----"); + + EXPECT_TRUE(OpenMaybeClearSignedFile(tempfile, fd)); + if (tempfile.empty() == false) + unlink(tempfile.c_str()); + EXPECT_TRUE(fd.IsOpen()); + char buffer[100]; + EXPECT_TRUE(fd.ReadLine(buffer, sizeof(buffer))); + EXPECT_STREQ(buffer, "Test"); + EXPECT_TRUE(fd.Eof()); +} + +TEST(OpenMaybeClearSignedFileTest,SignedFileWithContentHeaders) +{ + std::string tempfile; + FileFd fd; + createTemporaryFile("headerssignedfile", fd, &tempfile, "-----BEGIN PGP SIGNED MESSAGE-----\n" +"Version: 0.8.15~exp1\n" +"Hash: SHA512\n" +"Comment: I love you!\n" +"X-Expires: never\n" +"Multilines: no\n" +" yes\n" +" maybe\n" +"\n" +"Test\n" +"-----BEGIN PGP SIGNATURE-----\n" +"\n" +"iQFEBAEBCgAuFiEENKjp0Y2zIPNn6OqgWpDRQdusja4FAlhT7+kQHGpvZUBleGFt\n" +"cGxlLm9yZwAKCRBakNFB26yNrjvEB/9/e3jA1l0fvPafx9LEXcH8CLpUFQK7ra9l\n" +"3M4YAH4JKQlTG1be7ixruBRlCTh3YiSs66fKMeJeUYoxA2HPhvbGFEjQFAxunEYg\n" +"X/LBKv1mQWa+Q34P5GBjK8kQdLCN+yJAiUErmWNQG3GPninrxsC9tY5jcWvHeP1k\n" +"V7N3MLnNqzXaCJM24mnKidC5IDadUdQ8qC8c3rjUexQ8vBz0eucH56jbqV5oOcvx\n" +"pjlW965dCPIf3OI8q6J7bIOjyY+u/PTcVlqPq3TUz/ti6RkVbKpLH0D4ll3lUTns\n" +"JQt/+gJCPxHUJphy8sccBKhW29CLELJIIafvU30E1nWn9szh2Xjq\n" +"=TB1F\n" +"-----END PGP SIGNATURE-----\n"); + + EXPECT_TRUE(OpenMaybeClearSignedFile(tempfile, fd)); + if (tempfile.empty() == false) + unlink(tempfile.c_str()); + EXPECT_TRUE(fd.IsOpen()); + char buffer[100]; + EXPECT_TRUE(fd.ReadLine(buffer, sizeof(buffer))); + EXPECT_STREQ(buffer, "Test"); + EXPECT_TRUE(fd.Eof()); +} + +// That isn't how multiple signatures are done +TEST(OpenMaybeClearSignedFileTest,SignedFileWithTwoSignatures) +{ + std::string tempfile; + FileFd fd; + createTemporaryFile("doublesignedfile", fd, &tempfile, "-----BEGIN PGP SIGNED MESSAGE-----\n" +"Hash: SHA512\n" +"\n" +"Test\n" +"-----BEGIN PGP SIGNATURE-----\n" +"\n" +"iQFEBAEBCgAuFiEENKjp0Y2zIPNn6OqgWpDRQdusja4FAlhT7+kQHGpvZUBleGFt\n" +"cGxlLm9yZwAKCRBakNFB26yNrjvEB/9/e3jA1l0fvPafx9LEXcH8CLpUFQK7ra9l\n" +"3M4YAH4JKQlTG1be7ixruBRlCTh3YiSs66fKMeJeUYoxA2HPhvbGFEjQFAxunEYg\n" +"X/LBKv1mQWa+Q34P5GBjK8kQdLCN+yJAiUErmWNQG3GPninrxsC9tY5jcWvHeP1k\n" +"V7N3MLnNqzXaCJM24mnKidC5IDadUdQ8qC8c3rjUexQ8vBz0eucH56jbqV5oOcvx\n" +"pjlW965dCPIf3OI8q6J7bIOjyY+u/PTcVlqPq3TUz/ti6RkVbKpLH0D4ll3lUTns\n" +"JQt/+gJCPxHUJphy8sccBKhW29CLELJIIafvU30E1nWn9szh2Xjq\n" +"=TB1F\n" +"-----END PGP SIGNATURE-----\n" +"-----BEGIN PGP SIGNATURE-----\n" +"\n" +"iQFHBAEBCgAxFiEE3mauypFRr6GHfsMd6FJdR1KBROIFAlhT/yYTHG1hcnZpbkBl\n" +"eGFtcGxlLm9yZwAKCRDoUl1HUoFE4qq3B/459MSk3xCW30wc5+ul5ZxTSg6eLYPJ\n" +"tfVNYi90/ZxRrYQAN+EWozEIZcxoMYp8Ans3++irkjPbHs4NsesmFKt2W5meFl4V\n" +"oUzYrOh5y5GlDeF7ok5g9atQe8BojjBics+g1IBYcnaMU+ywONmlixa03IPGfxV5\n" +"oTx02Xvlns20i6HRc0WFtft5q1hXo4EIlVc9O0u902SVEEkeuHF3+bCcXrNLPBJA\n" +"+8dxmH5+i89f/kVqURrdHdEuA1tsTNyb2C+lvRONh21H8QRRTU/iUQSzV6vZvof5\n" +"ASc9hsAZRG0xHuRU0F94V/XrkWw8QYAobJ/yxvs4L0EuA4optbSqawDB\n" +"=CP8j\n" +"-----END PGP SIGNATURE-----\n"); + + EXPECT_TRUE(OpenMaybeClearSignedFile(tempfile, fd)); + if (tempfile.empty() == false) + unlink(tempfile.c_str()); + EXPECT_TRUE(fd.IsOpen()); + char buffer[100]; + EXPECT_TRUE(fd.ReadLine(buffer, sizeof(buffer))); + EXPECT_STREQ(buffer, "Test"); + EXPECT_TRUE(fd.Eof()); +} + +TEST(OpenMaybeClearSignedFileTest,TwoSimpleSignedFile) +{ + std::string tempfile; + FileFd fd; + // read only the first message + createTemporaryFile("twosimplesignedfile", fd, &tempfile, "-----BEGIN PGP SIGNED MESSAGE-----\n" +"Hash: SHA512\n" +"\n" +"Test\n" +"-----BEGIN PGP SIGNATURE-----\n" +"\n" +"iQFEBAEBCgAuFiEENKjp0Y2zIPNn6OqgWpDRQdusja4FAlhT7+kQHGpvZUBleGFt\n" +"cGxlLm9yZwAKCRBakNFB26yNrjvEB/9/e3jA1l0fvPafx9LEXcH8CLpUFQK7ra9l\n" +"3M4YAH4JKQlTG1be7ixruBRlCTh3YiSs66fKMeJeUYoxA2HPhvbGFEjQFAxunEYg\n" +"X/LBKv1mQWa+Q34P5GBjK8kQdLCN+yJAiUErmWNQG3GPninrxsC9tY5jcWvHeP1k\n" +"V7N3MLnNqzXaCJM24mnKidC5IDadUdQ8qC8c3rjUexQ8vBz0eucH56jbqV5oOcvx\n" +"pjlW965dCPIf3OI8q6J7bIOjyY+u/PTcVlqPq3TUz/ti6RkVbKpLH0D4ll3lUTns\n" +"JQt/+gJCPxHUJphy8sccBKhW29CLELJIIafvU30E1nWn9szh2Xjq\n" +"=TB1F\n" +"-----END PGP SIGNATURE-----\n" +"-----BEGIN PGP SIGNED MESSAGE-----\n" +"Hash: SHA512\n" +"\n" +"Test\n" +"-----BEGIN PGP SIGNATURE-----\n" +"\n" +"iQFEBAEBCgAuFiEENKjp0Y2zIPNn6OqgWpDRQdusja4FAlhT7+kQHGpvZUBleGFt\n" +"cGxlLm9yZwAKCRBakNFB26yNrjvEB/9/e3jA1l0fvPafx9LEXcH8CLpUFQK7ra9l\n" +"3M4YAH4JKQlTG1be7ixruBRlCTh3YiSs66fKMeJeUYoxA2HPhvbGFEjQFAxunEYg\n" +"X/LBKv1mQWa+Q34P5GBjK8kQdLCN+yJAiUErmWNQG3GPninrxsC9tY5jcWvHeP1k\n" +"V7N3MLnNqzXaCJM24mnKidC5IDadUdQ8qC8c3rjUexQ8vBz0eucH56jbqV5oOcvx\n" +"pjlW965dCPIf3OI8q6J7bIOjyY+u/PTcVlqPq3TUz/ti6RkVbKpLH0D4ll3lUTns\n" +"JQt/+gJCPxHUJphy8sccBKhW29CLELJIIafvU30E1nWn9szh2Xjq\n" +"=TB1F\n" +"-----END PGP SIGNATURE-----"); + + EXPECT_TRUE(_error->empty()); + EXPECT_TRUE(OpenMaybeClearSignedFile(tempfile, fd)); + if (tempfile.empty() == false) + unlink(tempfile.c_str()); + EXPECT_FALSE(_error->empty()); + EXPECT_TRUE(fd.IsOpen()); + char buffer[100]; + EXPECT_TRUE(fd.ReadLine(buffer, sizeof(buffer))); + EXPECT_STREQ(buffer, "Test"); + EXPECT_TRUE(fd.Eof()); + ASSERT_FALSE(_error->empty()); + + std::string msg; + _error->PopMessage(msg); + EXPECT_EQ("Clearsigned file '" + tempfile + "' contains unsigned lines.", msg); +} + +TEST(OpenMaybeClearSignedFileTest,UnsignedFile) +{ + std::string tempfile; + FileFd fd; + createTemporaryFile("unsignedfile", fd, &tempfile, "Test"); + + EXPECT_TRUE(OpenMaybeClearSignedFile(tempfile, fd)); + if (tempfile.empty() == false) + unlink(tempfile.c_str()); + EXPECT_TRUE(fd.IsOpen()); + char buffer[100]; + EXPECT_TRUE(fd.ReadLine(buffer, sizeof(buffer))); + EXPECT_STREQ(buffer, "Test"); + EXPECT_TRUE(fd.Eof()); +} + +TEST(OpenMaybeClearSignedFileTest,GarbageTop) +{ + std::string tempfile; + FileFd fd; + createTemporaryFile("garbagetop", fd, &tempfile, "Garbage\n" +"-----BEGIN PGP SIGNED MESSAGE-----\n" +"Hash: SHA512\n" +"\n" +"Test\n" +"-----BEGIN PGP SIGNATURE-----\n" +"\n" +"iQFEBAEBCgAuFiEENKjp0Y2zIPNn6OqgWpDRQdusja4FAlhT7+kQHGpvZUBleGFt\n" +"cGxlLm9yZwAKCRBakNFB26yNrjvEB/9/e3jA1l0fvPafx9LEXcH8CLpUFQK7ra9l\n" +"3M4YAH4JKQlTG1be7ixruBRlCTh3YiSs66fKMeJeUYoxA2HPhvbGFEjQFAxunEYg\n" +"X/LBKv1mQWa+Q34P5GBjK8kQdLCN+yJAiUErmWNQG3GPninrxsC9tY5jcWvHeP1k\n" +"V7N3MLnNqzXaCJM24mnKidC5IDadUdQ8qC8c3rjUexQ8vBz0eucH56jbqV5oOcvx\n" +"pjlW965dCPIf3OI8q6J7bIOjyY+u/PTcVlqPq3TUz/ti6RkVbKpLH0D4ll3lUTns\n" +"JQt/+gJCPxHUJphy8sccBKhW29CLELJIIafvU30E1nWn9szh2Xjq\n" +"=TB1F\n" +"-----END PGP SIGNATURE-----\n"); + + EXPECT_TRUE(_error->empty()); + EXPECT_TRUE(OpenMaybeClearSignedFile(tempfile, fd)); + if (tempfile.empty() == false) + unlink(tempfile.c_str()); + EXPECT_TRUE(fd.IsOpen()); + char buffer[100]; + EXPECT_TRUE(fd.ReadLine(buffer, sizeof(buffer))); + EXPECT_STREQ(buffer, "Test"); + EXPECT_TRUE(fd.Eof()); + ASSERT_FALSE(_error->empty()); + ASSERT_FALSE(_error->PendingError()); + + std::string msg; + _error->PopMessage(msg); + EXPECT_EQ("Clearsigned file '" + tempfile + "' does not start with a signed message block.", msg); +} + +TEST(OpenMaybeClearSignedFileTest,GarbageBottom) +{ + std::string tempfile; + FileFd fd; + createTemporaryFile("garbagebottom", fd, &tempfile, "-----BEGIN PGP SIGNED MESSAGE-----\n" +"Hash: SHA512\n" +"\n" +"Test\n" +"-----BEGIN PGP SIGNATURE-----\n" +"\n" +"iQFEBAEBCgAuFiEENKjp0Y2zIPNn6OqgWpDRQdusja4FAlhT7+kQHGpvZUBleGFt\n" +"cGxlLm9yZwAKCRBakNFB26yNrjvEB/9/e3jA1l0fvPafx9LEXcH8CLpUFQK7ra9l\n" +"3M4YAH4JKQlTG1be7ixruBRlCTh3YiSs66fKMeJeUYoxA2HPhvbGFEjQFAxunEYg\n" +"X/LBKv1mQWa+Q34P5GBjK8kQdLCN+yJAiUErmWNQG3GPninrxsC9tY5jcWvHeP1k\n" +"V7N3MLnNqzXaCJM24mnKidC5IDadUdQ8qC8c3rjUexQ8vBz0eucH56jbqV5oOcvx\n" +"pjlW965dCPIf3OI8q6J7bIOjyY+u/PTcVlqPq3TUz/ti6RkVbKpLH0D4ll3lUTns\n" +"JQt/+gJCPxHUJphy8sccBKhW29CLELJIIafvU30E1nWn9szh2Xjq\n" +"=TB1F\n" +"-----END PGP SIGNATURE-----\n" +"Garbage"); + + EXPECT_TRUE(_error->empty()); + EXPECT_TRUE(OpenMaybeClearSignedFile(tempfile, fd)); + if (tempfile.empty() == false) + unlink(tempfile.c_str()); + EXPECT_TRUE(fd.IsOpen()); + char buffer[100]; + EXPECT_TRUE(fd.ReadLine(buffer, sizeof(buffer))); + EXPECT_STREQ(buffer, "Test"); + EXPECT_TRUE(fd.Eof()); + ASSERT_FALSE(_error->empty()); + ASSERT_FALSE(_error->PendingError()); + + std::string msg; + _error->PopMessage(msg); + EXPECT_EQ("Clearsigned file '" + tempfile + "' contains unsigned lines.", msg); +} + +TEST(OpenMaybeClearSignedFileTest,BogusNoSig) +{ + std::string tempfile; + FileFd fd; + createTemporaryFile("bogusnosig", fd, &tempfile, "-----BEGIN PGP SIGNED MESSAGE-----\n" +"Hash: SHA512\n" +"\n" +"Test"); + + EXPECT_TRUE(_error->empty()); + EXPECT_FALSE(OpenMaybeClearSignedFile(tempfile, fd)); + if (tempfile.empty() == false) + unlink(tempfile.c_str()); + EXPECT_FALSE(_error->empty()); + EXPECT_FALSE(fd.IsOpen()); + + std::string msg; + _error->PopMessage(msg); + EXPECT_EQ("Splitting of file " + tempfile + " failed as it doesn't contain all expected parts 0 1 0", msg); +} + +TEST(OpenMaybeClearSignedFileTest,BogusSigStart) +{ + std::string tempfile; + FileFd fd; + createTemporaryFile("bogusnosig", fd, &tempfile, "-----BEGIN PGP SIGNED MESSAGE-----\n" +"Hash: SHA512\n" +"\n" +"Test\n" +"-----BEGIN PGP SIGNATURE-----"); + + EXPECT_TRUE(_error->empty()); + EXPECT_FALSE(OpenMaybeClearSignedFile(tempfile, fd)); + if (tempfile.empty() == false) + unlink(tempfile.c_str()); + EXPECT_FALSE(_error->empty()); + EXPECT_FALSE(fd.IsOpen()); + + std::string msg; + _error->PopMessage(msg); + EXPECT_EQ("Signature in file " + tempfile + " wasn't closed", msg); +} diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc index f537542b4..c2781b5d6 100644 --- a/test/libapt/parsedepends_test.cc +++ b/test/libapt/parsedepends_test.cc @@ -9,13 +9,15 @@ #include <gtest/gtest.h> -static void parseDependency(bool const StripMultiArch, bool const ParseArchFlags, bool const ParseRestrictionsList) +static void parseDependency(bool const StripMultiArch, bool const ParseArchFlags, bool const ParseRestrictionsList, std::string Arch) { std::string Package; std::string Version; unsigned int Op = 5; unsigned int Null = 0; - _config->Set("APT::Architecture","amd64"); + // The tests are made for amd64. Specify a different arch here to check if + // they still work. + _config->Set("APT::Architecture",Arch); _config->Set("APT::Build-Profiles","stage1"); const char* Depends = @@ -47,7 +49,7 @@ static void parseDependency(bool const StripMultiArch, bool const ParseArchFlag const char* Start = Depends; const char* End = Depends + strlen(Depends); - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); if (StripMultiArch == true) EXPECT_EQ("debhelper", Package); else @@ -55,7 +57,7 @@ static void parseDependency(bool const StripMultiArch, bool const ParseArchFlag EXPECT_EQ("5.0", Version); EXPECT_EQ(Null | pkgCache::Dep::GreaterEq, Op); - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); if (StripMultiArch == true) EXPECT_EQ("libdb-dev", Package); else @@ -63,7 +65,7 @@ static void parseDependency(bool const StripMultiArch, bool const ParseArchFlag EXPECT_EQ("", Version); EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op); - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); if (StripMultiArch == true) EXPECT_EQ("gettext", Package); else @@ -71,7 +73,7 @@ static void parseDependency(bool const StripMultiArch, bool const ParseArchFlag EXPECT_EQ("0.12", Version); EXPECT_EQ(Null | pkgCache::Dep::LessEq, Op); - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); if (StripMultiArch == true) EXPECT_EQ("libcurl4-gnutls-dev", Package); else @@ -79,160 +81,160 @@ static void parseDependency(bool const StripMultiArch, bool const ParseArchFlag EXPECT_EQ("", Version); EXPECT_EQ(Null | pkgCache::Dep::Or, Op); - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("libcurl3-gnutls-dev", Package); EXPECT_EQ("7.15.5", Version); EXPECT_EQ(Null | pkgCache::Dep::Greater, Op); - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("docbook-xml", Package); EXPECT_EQ("", Version); EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op); - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("apt", Package); EXPECT_EQ("0.7.25", Version); EXPECT_EQ(Null | pkgCache::Dep::GreaterEq, Op); if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("", Package); // not-for-me } else { - EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64")); Start = strstr(Start, ","); Start++; } if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("only-for-me", Package); EXPECT_EQ("", Version); EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op); } else { - EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64")); Start = strstr(Start, ","); Start++; } if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("any-for-me", Package); EXPECT_EQ("", Version); EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op); } else { - EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64")); Start = strstr(Start, ","); Start++; } if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("not-for-darwin", Package); EXPECT_EQ("", Version); EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op); } else { - EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64")); Start = strstr(Start, ","); Start++; } if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("cpu-for-me", Package); EXPECT_EQ("", Version); EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op); } else { - EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64")); Start = strstr(Start, ","); Start++; } if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("os-for-me", Package); EXPECT_EQ("", Version); EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op); } else { - EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64")); Start = strstr(Start, ","); Start++; } if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("libc-for-me", Package); EXPECT_EQ("", Version); EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op); } else { - EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64")); Start = strstr(Start, ","); Start++; } if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("", Package); // libc-not-for-me } else { - EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64")); Start = strstr(Start, ","); Start++; } if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("", Package); // cpu-not-for-me } else { - EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64")); Start = strstr(Start, ","); Start++; } if (ParseArchFlags == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("", Package); // os-not-for-me } else { - EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64")); Start = strstr(Start, ","); Start++; } if (ParseRestrictionsList == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("", Package); // not-in-stage1 } else { - EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64")); Start = strstr(Start, ","); Start++; } if (ParseRestrictionsList == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("", Package); // not-stage1-and-not-nodoc } else { - EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64")); Start = strstr(Start, ","); Start++; } if (ParseRestrictionsList == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("not-stage1-or-not-nodoc", Package); } else { - EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64")); Start = strstr(Start, ","); Start++; } if (ParseRestrictionsList == true) { - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); EXPECT_EQ("", Package); // unknown-profile } else { - EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList)); + EXPECT_EQ(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64")); Start = strstr(Start, ","); Start++; } - Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); if (StripMultiArch == true) EXPECT_EQ("overlord-dev", Package); else @@ -240,7 +242,7 @@ static void parseDependency(bool const StripMultiArch, bool const ParseArchFlag EXPECT_EQ("7.15.3~", Version); EXPECT_EQ(Null | pkgCache::Dep::Equals | pkgCache::Dep::Or, Op); - debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); + debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList, "amd64"); if (StripMultiArch == true) EXPECT_EQ("overlord-dev", Package); else @@ -262,7 +264,8 @@ test: SCOPED_TRACE(std::string("StripMultiArch: ") + (StripMultiArch ? "true" : "false")); SCOPED_TRACE(std::string("ParseArchFlags: ") + (ParseArchFlags ? "true" : "false")); SCOPED_TRACE(std::string("ParseRestrictionsList: ") + (ParseRestrictionsList ? "true" : "false")); - parseDependency(StripMultiArch, ParseArchFlags, ParseRestrictionsList); + parseDependency(StripMultiArch, ParseArchFlags, ParseRestrictionsList, "kfreebsd-i386"); + parseDependency(StripMultiArch, ParseArchFlags, ParseRestrictionsList, "amd64"); } if (StripMultiArch == false) { if (ParseArchFlags == false) diff --git a/triehash/triehash.pl b/triehash/triehash.pl index c722cc62d..c943c1d9f 100755 --- a/triehash/triehash.pl +++ b/triehash/triehash.pl @@ -296,7 +296,7 @@ package Trie { return $self->alignpower2(length $key); } - # Rebuild the trie, splitting at ambigous chars, and unifying key lengths + # Rebuild the trie, splitting at ambiguous chars, and unifying key lengths sub rebuild_tree { my $self = shift; # Determine if/where we need to split before an ambiguous character |