From 52090faab4401ad6a2acb4d2c0c2cb53aa6b8f7f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 13 Feb 2014 14:47:34 +0100 Subject: trivial indent fix --- cmdline/apt.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmdline/apt.cc b/cmdline/apt.cc index 6ad470faa..7ef9060aa 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -82,7 +82,7 @@ bool ShowHelp(CommandLine &CmdL) " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" - "full-upgrade - upgrade the system by removing/installing/upgrading packages\n" + " full-upgrade - upgrade the system by removing/installing/upgrading packages\n" "\n" " edit-sources - edit the source information file\n" ); -- cgit v1.2.3 From 4bca852015e95a36fddfba4b8874f2666da3c2ff Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 12 Feb 2014 15:01:40 +0100 Subject: do not recommend dselect in apt-get manpage The current description says: "Many users find dselect intimidating and new users may prefer to use apt-based user interfaces." It doesn't feel right to refer users to it then. Closes: 617625 --- doc/apt-get.8.xml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index b97bc268e..595ea875d 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -40,7 +40,7 @@ Description apt-get is the command-line tool for handling packages, and may be considered the user's "back-end" to other tools using the APT - library. Several "front-end" interfaces exist, such as &dselect;, + library. Several "front-end" interfaces exist, such as &aptitude;, &synaptic; and &wajig;. Unless the , or option is given, one of the @@ -217,10 +217,7 @@ clean clears out the local repository of retrieved package files. It removes everything but the lock file from &cachedir;/archives/ and - &cachedir;/archives/partial/. When APT is used as a - &dselect; method, clean is run automatically. - Those who do not use dselect will likely want to run apt-get clean - from time to time to free up disk space. + &cachedir;/archives/partial/. @@ -284,7 +281,7 @@ running APT for the first time; APT itself does not allow broken package dependencies to exist on a system. It is possible that a system's dependency structure can be so corrupt as to require manual intervention - (which usually means using &dselect; or dpkg --remove to eliminate some of + (which usually means using dpkg --remove to eliminate some of the offending packages). Use of this option together with may produce an error in some situations. Configuration Item: APT::Get::Fix-Broken. @@ -548,7 +545,7 @@ See Also - &apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, + &apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the APT Howto. -- cgit v1.2.3 From f9b4f12d65b827612b29071f05d605bc05fa62bd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 13 Feb 2014 23:38:28 +0100 Subject: report https download start only if we really get it Reporting it via progress means that e.g. a redirect will trigger it, too, so you get a Get & Hit while http only reports a Hit as it should be. --- methods/https.cc | 3 ++- test/integration/test-bug-602412-dequote-redirect | 33 ++++++++++++++--------- test/interactive-helper/aptwebserver.cc | 20 +++++++++++--- 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/methods/https.cc b/methods/https.cc index 146b2bfb8..d97fddf9e 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -75,6 +75,8 @@ HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp) { HttpsMethod *me = (HttpsMethod *)userp; + if (me->Res.Size == 0) + me->URIStart(me->Res); if(me->File->Write(buffer, size*nmemb) != true) return false; @@ -88,7 +90,6 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, HttpsMethod *me = (HttpsMethod *)clientp; if(dltotal > 0 && me->Res.Size == 0) { me->Res.Size = (unsigned long long)dltotal; - me->URIStart(me->Res); } return 0; } diff --git a/test/integration/test-bug-602412-dequote-redirect b/test/integration/test-bug-602412-dequote-redirect index bcebb57b8..6393f0c27 100755 --- a/test/integration/test-bug-602412-dequote-redirect +++ b/test/integration/test-bug-602412-dequote-redirect @@ -15,15 +15,24 @@ changetowebserver -o aptwebserver::redirect::replace::/pool/=/newpool/ \ mv aptarchive/pool aptarchive/newpool mv aptarchive/dists aptarchive/newdists -msgtest 'Test redirection works in' 'apt-get update' -testsuccess --nomsg aptget update - -# check that I-M-S header is kept in redirections -testequal 'Hit http://localhost:8080 unstable InRelease -Hit http://localhost:8080 unstable/main Sources -Hit http://localhost:8080 unstable/main amd64 Packages -Hit http://localhost:8080 unstable/main Translation-en -Reading package lists...' aptget update #-o debug::pkgacquire=1 -o debug::pkgacquire::worker=1 - -msgtest 'Test redirection works in' 'package download' -testsuccess --nomsg aptget install unrelated --download-only -y +testrun() { + msgtest 'Test redirection works in' 'apt-get update' + testsuccess --nomsg aptget update + + # check that I-M-S header is kept in redirections + testequal "Hit $1 unstable InRelease +Hit $1 unstable/main Sources +Hit $1 unstable/main amd64 Packages +Hit $1 unstable/main Translation-en +Reading package lists..." aptget update + + msgtest 'Test redirection works in' 'package download' + testsuccess --nomsg aptget install unrelated --download-only -y +} + +testrun 'http://localhost:8080' + +rm -rf rootdir/var/lib/apt/lists rootdir/var/cache/apt/archives +changetohttpswebserver + +testrun 'https://localhost:4433' diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc index b7663a76a..992f802a6 100644 --- a/test/interactive-helper/aptwebserver.cc +++ b/test/interactive-helper/aptwebserver.cc @@ -197,9 +197,14 @@ void sendRedirect(int const client, int const httpcode, std::string const &uri,/ response.append(request).append(""); addDataHeaders(headers, response); std::string location("Location: "); - if (strncmp(uri.c_str(), "http://", 7) != 0) + if (strncmp(uri.c_str(), "http://", 7) != 0 && strncmp(uri.c_str(), "https://", 8) != 0) { - location.append("http://").append(LookupTag(request, "Host")).append("/"); + std::string const host = LookupTag(request, "Host"); + if (host.find(":4433") != std::string::npos) + location.append("https://"); + else + location.append("http://"); + location.append(host).append("/"); if (strncmp("/home/", uri.c_str(), strlen("/home/")) == 0 && uri.find("/public_html/") != std::string::npos) { std::string homeuri = SubstVar(uri, "/home/", "~"); @@ -507,7 +512,8 @@ void * handleClient(void * voidclient) /*{{{*/ std::string redirect = "/" + filename; for (::Configuration::Item *I = Replaces->Child; I != NULL; I = I->Next) redirect = SubstVar(redirect, I->Tag, I->Value); - redirect.erase(0,1); + if (redirect.empty() == false && redirect[0] == '/') + redirect.erase(0,1); if (redirect != filename) { sendRedirect(client, 301, redirect, *m, sendContent); @@ -542,7 +548,13 @@ void * handleClient(void * voidclient) /*{{{*/ } // deal with the request - if (RealFileExists(filename) == true) + if (_config->FindB("aptwebserver::support::http", true) == false && + LookupTag(*m, "Host").find(":4433") == std::string::npos) + { + sendError(client, 400, *m, sendContent, "HTTP disabled, all requests must be HTTPS"); + continue; + } + else if (RealFileExists(filename) == true) { FileFd data(filename, FileFd::ReadOnly); std::string condition = LookupTag(*m, "If-Modified-Since", ""); -- cgit v1.2.3 From 9082a1fc7be02f58cbe18a34539c6a3436463dd0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 14 Feb 2014 00:30:58 +0100 Subject: allow http protocol to switch to https switch protocols at random is a bad idea if e.g. http can switch to file, so we limit the possibilities to http to http and http to https. As very few people (less than 1% according to popcon) have https installed this likely changes nothing in terms of failure. The commit is adding a friendly hint which package needs to be installed though. --- apt-pkg/acquire-worker.cc | 7 +++- methods/server.cc | 14 ++++--- test/integration/framework | 2 +- test/integration/test-bug-738785-switch-protocol | 52 ++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 7 deletions(-) create mode 100755 test/integration/test-bug-738785-switch-protocol diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 44a84216a..44c3e4e17 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -109,7 +109,12 @@ bool pkgAcquire::Worker::Start() // Get the method path string Method = _config->FindDir("Dir::Bin::Methods") + Access; if (FileExists(Method) == false) - return _error->Error(_("The method driver %s could not be found."),Method.c_str()); + { + _error->Error(_("The method driver %s could not be found."),Method.c_str()); + if (Access == "https") + _error->Notice(_("Is the package %s installed?"), "apt-transport-https"); + return false; + } if (Debug == true) clog << "Starting method '" << Method << '\'' << endl; diff --git a/methods/server.cc b/methods/server.cc index 76faa7e7f..6dd3970a6 100644 --- a/methods/server.cc +++ b/methods/server.cc @@ -291,11 +291,15 @@ ServerMethod::DealWithHeaders(FetchResult &Res) } else { - NextURI = DeQuoteString(Server->Location); - URI tmpURI = NextURI; - // Do not allow a redirection to switch protocol - if (tmpURI.Access == "http") - return TRY_AGAIN_OR_REDIRECT; + NextURI = DeQuoteString(Server->Location); + URI tmpURI = NextURI; + URI Uri = Queue->Uri; + // same protocol redirects are okay + if (tmpURI.Access == Uri.Access) + return TRY_AGAIN_OR_REDIRECT; + // as well as http to https + else if (Uri.Access == "http" && tmpURI.Access == "https") + return TRY_AGAIN_OR_REDIRECT; } /* else pass through for error message */ } diff --git a/test/integration/framework b/test/integration/framework index 5b9a58568..f3699861b 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -190,7 +190,7 @@ setupenvironment() { mkdir -p var/lib/dpkg/info var/lib/dpkg/updates var/lib/dpkg/triggers touch var/lib/dpkg/available mkdir -p usr/lib/apt - ln -s ${BUILDDIRECTORY}/methods usr/lib/apt/methods + ln -s ${METHODSDIR} usr/lib/apt/methods cd .. local PACKAGESFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Packages-/' -e 's/^skip-/Packages-/') if [ -f "${TESTDIRECTORY}/${PACKAGESFILE}" ]; then diff --git a/test/integration/test-bug-738785-switch-protocol b/test/integration/test-bug-738785-switch-protocol new file mode 100755 index 000000000..d3469f34f --- /dev/null +++ b/test/integration/test-bug-738785-switch-protocol @@ -0,0 +1,52 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +buildsimplenativepackage 'apt' 'all' '1.0' 'stable' + +# setup http redirecting to https +setupaptarchive --no-update +changetowebserver -o 'aptwebserver::redirect::replace::/redirectme/=https://localhost:4433/' \ + -o 'aptwebserver::support::http=false' +changetohttpswebserver +sed -i -e 's#:4433/#:8080/redirectme#' -e 's# https:# http:#' rootdir/etc/apt/sources.list.d/* + +testsuccess aptget update -o Debug::Acquire::http=1 -o Debug::Acquire::https=1 -o Debug::pkgAcquire::Worker=1 + +msgtest 'Test that the webserver does not answer' 'http requests' +downloadfile 'http://localhost:8080//pool/apt_1.0/changelog' >/dev/null 2>&1 && msgfail || msgpass + +echo 'Apt::Changelogs::Server "http://localhost:8080/redirectme";' > rootdir/etc/apt/apt.conf.d/changelog.conf +testequal "'http://localhost:8080/redirectme/pool/apt_1.0/changelog'" aptget changelog apt --print-uris + +testsuccess aptget changelog apt -d +testsuccess test -s apt.changelog +rm -f apt.changelog + +testsuccess aptget download apt +testsuccess test -s apt_1.0_all.deb +rm apt_1.0_all.deb + +testsuccess aptget install apt -y +testdpkginstalled 'apt' + +# create a copy of all methods, expect https +eval `aptconfig shell METHODS Dir::Bin::Methods/d` +COPYMETHODS='usr/lib/apt/methods' +rm rootdir/$COPYMETHODS +mkdir -p rootdir/$COPYMETHODS +cd rootdir/$COPYMETHODS +find $METHODS \! -type d | while read meth; do + ln -s $meth +done +rm https +cd - >/dev/null +echo "Dir::Bin::Methods \"${COPYMETHODS}\";" >> aptconfig.conf + +aptget download apt +testsuccess test ! -e apt_1.0_all.deb -- cgit v1.2.3 From 75b093128e7ced667f8ed89a5367af461e727736 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 14 Feb 2014 00:44:06 +0100 Subject: enforce 'house-style' on changelog testcase Git-Dch: Ignore --- test/integration/test-apt-get-changelog | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/integration/test-apt-get-changelog b/test/integration/test-apt-get-changelog index d013cc458..a73c3e249 100755 --- a/test/integration/test-apt-get-changelog +++ b/test/integration/test-apt-get-changelog @@ -9,11 +9,11 @@ configarchitecture "i386" buildsimplenativepackage 'apt' 'all' '1.0' 'stable' -setupaptarchive +setupaptarchive --no-update changetowebserver -aptget update -qq +testsuccess aptget update -echo 'Apt::Changelogs::Server "http://localhost:8080/";' >> ./aptconfig.conf +echo 'Apt::Changelogs::Server "http://localhost:8080/";' > rootdir/etc/apt/apt.conf.d/changelog.conf testequal "'http://localhost:8080//pool/apt_1.0/changelog'" aptget changelog apt --print-uris @@ -24,7 +24,7 @@ aptget changelog apt -qq > apt.changelog testfileequal 'apt.changelog' "$(cat aptarchive/pool/apt_1.0/changelog)" rm apt.changelog -aptget changelog apt -d -qq +testsuccess aptget changelog apt -d testfileequal 'apt.changelog' "$(cat aptarchive/pool/apt_1.0/changelog)" rm apt.changelog aptarchive/pool/apt_1.0/changelog @@ -32,7 +32,7 @@ aptget changelog apt -qq -o APT::Changelogs::Server='http://not-on-the-main-serv testfileequal 'apt.changelog' "$(cat aptarchive/pool/apt_1.0.changelog)" rm apt.changelog -aptget changelog apt -d -qq +testsuccess aptget changelog apt -d testfileequal 'apt.changelog' "$(cat aptarchive/pool/apt_1.0.changelog)" rm apt.changelog aptarchive/pool/apt_1.0.changelog -- cgit v1.2.3 From c7a7271840cfc92d447f73d9a3b8ee146532b893 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 14 Feb 2014 00:55:20 +0100 Subject: do not compress .xhtml files and remove junk files dh_compress compresses .xhtml files by default, which breaks our doxygen documentation. doxygen has also a bunch of temporary files it creates which stay in the build directory and so we remove them before installing them as documentation. Closes: 738933 --- debian/rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 3aa86480e..1b3782ab6 100755 --- a/debian/rules +++ b/debian/rules @@ -134,6 +134,7 @@ libapt-pkg-doc: build-debiandoc # # libapt-pkg-doc install # + rm -f $(BLD)/doc/doxygen/html/*.map $(BLD)/doc/doxygen/html/*.md5 dh_installdocs -p$@ $(BLD)/docs/design* \ $(BLD)/docs/dpkg-tech* \ $(BLD)/docs/files* \ @@ -145,7 +146,7 @@ libapt-pkg-doc: build-debiandoc dh_installchangelogs -p$@ dh_strip -p$@ - dh_compress -p$@ + dh_compress -p$@ -X.xhtml dh_fixperms -p$@ dh_installdeb -p$@ dh_gencontrol -p$@ -- cgit v1.2.3 From 3f621056f7f672988c0efc6d38935c22b5ae041f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 14 Feb 2014 17:32:42 +0100 Subject: test/integration/test-bug-723705-tagfile-truncates-fields: fix autopkgtest failure --- test/integration/test-bug-723705-tagfile-truncates-fields | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/test-bug-723705-tagfile-truncates-fields b/test/integration/test-bug-723705-tagfile-truncates-fields index 3180e7fc9..29f98550c 100755 --- a/test/integration/test-bug-723705-tagfile-truncates-fields +++ b/test/integration/test-bug-723705-tagfile-truncates-fields @@ -8,7 +8,7 @@ configarchitecture 'amd64' setupaptarchive -aptget install --print-uris -y cdebconf-newt-terminal cdebconf-gtk-terminal 2>&1 | sed 's#file:///tmp/tmp.[^/]\+#file:///tmp#g' > filename.log +aptget install --print-uris -y cdebconf-newt-terminal cdebconf-gtk-terminal 2>&1 | sed "s#file://${TMPWORKINGDIRECTORY}#file:///tmp#g" > filename.log testfileequal filename.log "Reading package lists... Building dependency tree... -- cgit v1.2.3 From dc95fee18e8df2b00404c7d0f321f5b78e00f170 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 14 Feb 2014 17:11:07 +0100 Subject: disable https->http redirects in libcurl This change prevents changing the protocol from https to http. --- methods/https.cc | 3 +++ test/integration/framework | 2 +- test/integration/test-apt-https-no-redirect | 24 ++++++++++++++++++++++++ test/integration/test-bug-738785-switch-protocol | 2 +- 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100755 test/integration/test-apt-https-no-redirect diff --git a/methods/https.cc b/methods/https.cc index d97fddf9e..9422df2f0 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -185,8 +185,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_WRITEDATA, this); curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progress_callback); curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, this); + // options curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false); curl_easy_setopt(curl, CURLOPT_FILETIME, true); + // only allow redirects to https + curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS); // SSL parameters are set by default to the common (non mirror-specific) value // if available (or a default one) and gets overload by mirror-specific ones. diff --git a/test/integration/framework b/test/integration/framework index f3699861b..e4f018472 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -901,7 +901,7 @@ changetohttpswebserver() { msgdie 'You need to install stunnel4 for https testcases' fi if [ ! -e "${TMPWORKINGDIRECTORY}/aptarchive/aptwebserver.pid" ]; then - changetowebserver --no-rewrite + changetowebserver --no-rewrite "$@" fi echo "pid = ${TMPWORKINGDIRECTORY}/aptarchive/stunnel.pid cert = ${TESTDIRECTORY}/apt.pem diff --git a/test/integration/test-apt-https-no-redirect b/test/integration/test-apt-https-no-redirect new file mode 100755 index 000000000..c405d1167 --- /dev/null +++ b/test/integration/test-apt-https-no-redirect @@ -0,0 +1,24 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +buildsimplenativepackage 'apt' 'all' '1.0' 'stable' +setupaptarchive --no-update + +changetohttpswebserver -o 'aptwebserver::redirect::replace::/redirectme/=http://localhost:8080/' + +msgtest 'normal http download works' +downloadfile 'http://localhost:8080/pool/apt_1.0/changelog' changelog2 >/dev/null 2>/dev/null && msgpass || msgfail + +msgtest 'normal https download works' +downloadfile 'https://localhost:4433/pool/apt_1.0/changelog' changelog >/dev/null 2>/dev/null && msgpass || msgfail + +msgtest 'redirecting https to http does not work' +downloadfile 'https://localhost:4433/redirectme/pool/apt_1.0/changelog' changelog3 2>&1 | grep "Protocol http not supported or disabled in libcurl" > /dev/null && msgpass + + diff --git a/test/integration/test-bug-738785-switch-protocol b/test/integration/test-bug-738785-switch-protocol index d3469f34f..bc3c6dbad 100755 --- a/test/integration/test-bug-738785-switch-protocol +++ b/test/integration/test-bug-738785-switch-protocol @@ -19,7 +19,7 @@ sed -i -e 's#:4433/#:8080/redirectme#' -e 's# https:# http:#' rootdir/etc/apt/so testsuccess aptget update -o Debug::Acquire::http=1 -o Debug::Acquire::https=1 -o Debug::pkgAcquire::Worker=1 msgtest 'Test that the webserver does not answer' 'http requests' -downloadfile 'http://localhost:8080//pool/apt_1.0/changelog' >/dev/null 2>&1 && msgfail || msgpass +downloadfile 'http://localhost:8080/pool/apt_1.0/changelog' changelog >/dev/null 2>&1 && msgfail || msgpass echo 'Apt::Changelogs::Server "http://localhost:8080/redirectme";' > rootdir/etc/apt/apt.conf.d/changelog.conf testequal "'http://localhost:8080/redirectme/pool/apt_1.0/changelog'" aptget changelog apt --print-uris -- cgit v1.2.3 From 5543218acdbbeef1d9f6d118e0b86a765c341430 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 14 Feb 2014 18:35:35 +0100 Subject: honor option to disable pulses for the testcases Git-Dch: Ignore --- apt-private/acqprogress.cc | 7 +++++-- apt-private/acqprogress.h | 2 +- test/integration/test-bug-738785-switch-protocol | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc index af2d0f461..3aafea4f2 100644 --- a/apt-private/acqprogress.cc +++ b/apt-private/acqprogress.cc @@ -30,10 +30,13 @@ using namespace std; // AcqTextStatus::AcqTextStatus - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet) : - ScreenWidth(ScreenWidth), ID(0), Quiet(Quiet) +AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet) : + pkgAcquireStatus(), ScreenWidth(ScreenWidth), ID(0), Quiet(Quiet) { BlankLine[0] = 0; + // testcases use it to disable pulses without disabling other user messages + if (_config->FindB("quiet::NoUpdate", false) == true) + this->Quiet = 1; } /*}}}*/ // AcqTextStatus::Start - Downloading has started /*{{{*/ diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h index e47bfb72d..e12dafe50 100644 --- a/apt-private/acqprogress.h +++ b/apt-private/acqprogress.h @@ -32,7 +32,7 @@ class AcqTextStatus : public pkgAcquireStatus bool Pulse(pkgAcquire *Owner); - AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet); + AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet); }; #endif diff --git a/test/integration/test-bug-738785-switch-protocol b/test/integration/test-bug-738785-switch-protocol index bc3c6dbad..b51be244a 100755 --- a/test/integration/test-bug-738785-switch-protocol +++ b/test/integration/test-bug-738785-switch-protocol @@ -48,5 +48,6 @@ rm https cd - >/dev/null echo "Dir::Bin::Methods \"${COPYMETHODS}\";" >> aptconfig.conf -aptget download apt +testequal "E: The method driver $(pwd)/rootdir/usr/lib/apt/methods/https could not be found. +N: Is the package apt-transport-https installed?" aptget download apt -q=0 testsuccess test ! -e apt_1.0_all.deb -- cgit v1.2.3 From 8190b07a4b338e005fa30d769cb34f1fd29eaa45 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 14 Feb 2014 16:33:26 +0100 Subject: simplify code some more to make reddit happy Commit 6008b79adf1d7ea5607fab87a355d664c8725026 should have been guarded by "Git-Dch: Ignore", but it wasn't and I only noticed it with the Close message via deity thinking "hehe, I wonder if someone is gonna notice". Looks like someone did: hats off to reddit user itisOmegakai! Good to know that what I do isn't only monitored by goverments. :) As there is another instance of basically the same code we just factor out the code a bit and reuse, so its even cleaner and not only simpler. Reported-By: scan-build --- apt-pkg/contrib/fileutl.cc | 67 ++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 71ac9c73f..536284064 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1588,18 +1588,15 @@ unsigned long long FileFd::Tell() return Res; } /*}}}*/ -// FileFd::FileSize - Return the size of the file /*{{{*/ -// --------------------------------------------------------------------- -/* */ -unsigned long long FileFd::FileSize() +static bool StatFileFd(char const * const msg, int const iFd, std::string const &FileName, struct stat &Buf, FileFdPrivate * const d) /*{{{*/ { - struct stat Buf; - bool ispipe = (d != NULL && d->pipe == true); if (ispipe == false) { if (fstat(iFd,&Buf) != 0) - return FileFdErrno("fstat","Unable to determine the file size"); + // higher-level code will generate more meaningful messages, + // even translated this would be meaningless for users + return _error->Errno("fstat", "Unable to determine %s for fd %i", msg, iFd); ispipe = S_ISFIFO(Buf.st_mode); } @@ -1611,12 +1608,35 @@ unsigned long long FileFd::FileSize() if (d != NULL) d->pipe = true; if (stat(FileName.c_str(), &Buf) != 0) - return FileFdErrno("stat","Unable to determine the file size"); + return _error->Errno("fstat", "Unable to determine %s for file %s", msg, FileName.c_str()); + } + return true; +} + /*}}}*/ +// FileFd::FileSize - Return the size of the file /*{{{*/ +unsigned long long FileFd::FileSize() +{ + struct stat Buf; + if (StatFileFd("file size", iFd, FileName, Buf, d) == false) + { + Flags |= Fail; + return 0; } - return Buf.st_size; } /*}}}*/ +// FileFd::ModificationTime - Return the time of last touch /*{{{*/ +time_t FileFd::ModificationTime() +{ + struct stat Buf; + if (StatFileFd("modification time", iFd, FileName, Buf, d) == false) + { + Flags |= Fail; + return 0; + } + return Buf.st_mtime; +} + /*}}}*/ // FileFd::Size - Return the size of the content in the file /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -1688,35 +1708,6 @@ unsigned long long FileFd::Size() return size; } /*}}}*/ -// FileFd::ModificationTime - Return the time of last touch /*{{{*/ -// --------------------------------------------------------------------- -/* */ -time_t FileFd::ModificationTime() -{ - struct stat Buf; - if ((d == NULL || d->pipe == false) && fstat(iFd,&Buf) != 0) - { - FileFdErrno("fstat","Unable to determine the modification time of file %s", FileName.c_str()); - return 0; - } - - // for compressor pipes st_size is undefined and at 'best' zero - if ((d != NULL && d->pipe == true) || S_ISFIFO(Buf.st_mode)) - { - // we set it here, too, as we get the info here for free - // in theory the Open-methods should take care of it already - if (d != NULL) - d->pipe = true; - if (stat(FileName.c_str(), &Buf) != 0) - { - FileFdErrno("fstat","Unable to determine the modification time of file %s", FileName.c_str()); - return 0; - } - } - - return Buf.st_mtime; -} - /*}}}*/ // FileFd::Close - Close the file if the close flag is set /*{{{*/ // --------------------------------------------------------------------- /* */ -- cgit v1.2.3 From 889b0072a93a5afe9ffec93ab791d584c64754a0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 14 Feb 2014 18:59:46 +0100 Subject: =?UTF-8?q?add=20a=20testcase=20to=20check=20for=20forbidden=20htt?= =?UTF-8?q?ps=E2=86=92http=20downgrades?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Git-Dch: Ignore --- methods/https.cc | 3 ++- test/integration/framework | 2 +- test/integration/test-bug-738785-switch-protocol | 12 +++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/methods/https.cc b/methods/https.cc index 9422df2f0..e713be19f 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -188,7 +188,8 @@ bool HttpsMethod::Fetch(FetchItem *Itm) // options curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false); curl_easy_setopt(curl, CURLOPT_FILETIME, true); - // only allow redirects to https + // only allow curl to handle https, not the other stuff it supports + curl_easy_setopt(curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS); curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS); // SSL parameters are set by default to the common (non mirror-specific) value diff --git a/test/integration/framework b/test/integration/framework index e4f018472..08d796a10 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1119,7 +1119,7 @@ testfailure() { if [ "$1" = '--nomsg' ]; then shift else - msgtest 'Test for failure in execution of' "$*" + msgtest 'Test for failure in execution of' "$*" fi local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output" if $@ >${OUTPUT} 2>&1; then diff --git a/test/integration/test-bug-738785-switch-protocol b/test/integration/test-bug-738785-switch-protocol index b51be244a..1e5748eae 100755 --- a/test/integration/test-bug-738785-switch-protocol +++ b/test/integration/test-bug-738785-switch-protocol @@ -12,6 +12,7 @@ buildsimplenativepackage 'apt' 'all' '1.0' 'stable' # setup http redirecting to https setupaptarchive --no-update changetowebserver -o 'aptwebserver::redirect::replace::/redirectme/=https://localhost:4433/' \ + -o 'aptwebserver::redirect::replace::/downgrademe/=http://localhost:8080/' \ -o 'aptwebserver::support::http=false' changetohttpswebserver sed -i -e 's#:4433/#:8080/redirectme#' -e 's# https:# http:#' rootdir/etc/apt/sources.list.d/* @@ -38,7 +39,7 @@ testdpkginstalled 'apt' # create a copy of all methods, expect https eval `aptconfig shell METHODS Dir::Bin::Methods/d` COPYMETHODS='usr/lib/apt/methods' -rm rootdir/$COPYMETHODS +mv rootdir/${COPYMETHODS} rootdir/${COPYMETHODS}.bak mkdir -p rootdir/$COPYMETHODS cd rootdir/$COPYMETHODS find $METHODS \! -type d | while read meth; do @@ -51,3 +52,12 @@ echo "Dir::Bin::Methods \"${COPYMETHODS}\";" >> aptconfig.conf testequal "E: The method driver $(pwd)/rootdir/usr/lib/apt/methods/https could not be found. N: Is the package apt-transport-https installed?" aptget download apt -q=0 testsuccess test ! -e apt_1.0_all.deb + +# revert to all methods +rm -rf rootdir/$COPYMETHODS +mv rootdir/${COPYMETHODS}.bak rootdir/${COPYMETHODS} + +# check that downgrades from https to http are not allowed +webserverconfig 'aptwebserver::support::http' 'true' +sed -i -e 's#:8080/redirectme#:4433/downgrademe#' -e 's# http:# https:#' rootdir/etc/apt/sources.list.d/* +testfailure aptget update -- cgit v1.2.3 From 16724b66fef02208ef050a36f732991941e39025 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 14 Feb 2014 19:40:58 +0100 Subject: add missing canNotFindFnmatch/showFnmatchSelection (for the next ABI break) --- apt-pkg/cacheset.cc | 25 +++++++++++++++++++++++-- apt-pkg/cacheset.h | 6 ++++++ apt-private/private-cacheset.h | 5 +++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 29281aab9..1b1e6d595 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -204,12 +204,20 @@ PackageContainerInterface::FromFnmatch(PackageContainerInterface * const pci, } pci->insert(Pkg); +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) + helper.showFnmatchSelection(Pkg, pattern); +#else helper.showRegExSelection(Pkg, pattern); +#endif found = true; } if (found == false) { - helper.canNotFindRegEx(pci, Cache, pattern); +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) + helper.canNotFindFnmatch(pci, Cache, pattern); +#else + helper.canNotFindRegEx(pci, Cache, pattern); +#endif pci->setConstructor(UNKNOWN); return false; } @@ -588,7 +596,13 @@ void CacheSetHelper::canNotFindRegEx(PackageContainerInterface * const pci, pkgC if (ShowError == true) _error->Insert(ErrorType, _("Couldn't find any package by regex '%s'"), pattern.c_str()); } - /*}}}*/ +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +// canNotFindFnmatch - handle the case no package is found by a fnmatch /*{{{*/ +void CacheSetHelper::canNotFindFnmatch(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern) { + if (ShowError == true) + _error->Insert(ErrorType, _("Couldn't find any package by glob '%s'"), pattern.c_str()); +} +#endif /*}}}*/ // canNotFindPackage - handle the case no package is found from a string/*{{{*/ void CacheSetHelper::canNotFindPackage(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &str) { } @@ -648,6 +662,13 @@ void CacheSetHelper::showRegExSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern) { } /*}}}*/ +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +// showFnmatchSelection /*{{{*/ +void CacheSetHelper::showFnmatchSelection(pkgCache::PkgIterator const &pkg, + std::string const &pattern) { +} + /*}}}*/ +#endif // showSelectedVersion /*{{{*/ void CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 29103aad9..b69d74b8e 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -48,11 +48,17 @@ public: /*{{{*/ virtual void showTaskSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern); virtual void showRegExSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern); +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) + virtual void showFnmatchSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern); +#endif virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, std::string const &ver, bool const verIsRel); virtual void canNotFindTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern); virtual void canNotFindRegEx(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern); +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) + virtual void canNotFindFnmatch(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern); +#endif virtual void canNotFindPackage(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &str); virtual void canNotFindAllVer(VersionContainerInterface * const vci, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); diff --git a/apt-private/private-cacheset.h b/apt-private/private-cacheset.h index 15b531e9d..322b3be6b 100644 --- a/apt-private/private-cacheset.h +++ b/apt-private/private-cacheset.h @@ -101,6 +101,11 @@ public: Pkg.FullName(true).c_str(), pattern.c_str()); explicitlyNamed = false; } + virtual void showFnmatchSelection(pkgCache::PkgIterator const &Pkg, std::string const &pattern) { + ioprintf(out, _("Note, selecting '%s' for glob '%s'\n"), + Pkg.FullName(true).c_str(), pattern.c_str()); + explicitlyNamed = false; + } virtual void showRegExSelection(pkgCache::PkgIterator const &Pkg, std::string const &pattern) { ioprintf(out, _("Note, selecting '%s' for regex '%s'\n"), Pkg.FullName(true).c_str(), pattern.c_str()); -- cgit v1.2.3 From 32611903e8dcd6599042552c6c576b70e3d6633a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 14 Feb 2014 19:58:56 +0100 Subject: disable fnmatch() The current PackageContainerInterface::FromString() will do a FromFnmatch() first and then FromRegEx(). This commit reverts that change to restore the old behavior to only look for RegEx and not glob-style pattern. The rational is that: a) currently a fnmatch() is misleadingly reported as a regex match to the user (Bug#738880) b) a fnmatch may match something different than a a RegEx so the change broke a published interface --- apt-pkg/cacheset.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 1b1e6d595..eab1e09f8 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -312,7 +312,6 @@ bool PackageContainerInterface::FromString(PackageContainerInterface * const pci if (FromGroup(pci, Cache, str, helper) == false && FromTask(pci, Cache, str, helper) == false && - FromFnmatch(pci, Cache, str, helper) == false && FromRegEx(pci, Cache, str, helper) == false) { helper.canNotFindPackage(pci, Cache, str); -- cgit v1.2.3 From e5bdcc8708ee571a7d7d54bbdfa7e226300344ea Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 5 Nov 2012 11:31:29 +0100 Subject: add testcase for the autoremove feature Conflicts: debian/apt.auto-removal.sh --- test/integration/test-kernel-helper-autoremove | 33 ++++++++++++++++++++++ .../test-kernel-helper-autoremove.fake-dpkg | 13 +++++++++ 2 files changed, 46 insertions(+) create mode 100755 test/integration/test-kernel-helper-autoremove create mode 100644 test/integration/test-kernel-helper-autoremove.fake-dpkg diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove new file mode 100755 index 000000000..a4c31283e --- /dev/null +++ b/test/integration/test-kernel-helper-autoremove @@ -0,0 +1,33 @@ +#!/bin/sh + +set -e + +# setup testdir +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +TMPDIR=$(mktemp -d) +cd $TMPDIR +addtrap "cd /; rm -rf $TMPDIR" + +# create mock environment +mkdir apt.conf.d +cat > aptconfig.conf < Date: Mon, 5 Nov 2012 11:39:47 +0100 Subject: also check that the running kernel is kept --- test/integration/test-kernel-helper-autoremove | 4 +++- test/integration/test-kernel-helper-autoremove.fake-dpkg | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove index a4c31283e..4c0571b13 100755 --- a/test/integration/test-kernel-helper-autoremove +++ b/test/integration/test-kernel-helper-autoremove @@ -28,6 +28,8 @@ sh ${TESTDIR}/../../debian/apt.auto-removal.sh # and ensure its there, valid and version 10.0.0-1 is there too test -e $TMPDIR/apt.conf.d/01autoremove-kernels apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic\.\*" +# ... and also that the running kernel is exlucded +apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)\.\*" # done -msgpass \ No newline at end of file +msgpass diff --git a/test/integration/test-kernel-helper-autoremove.fake-dpkg b/test/integration/test-kernel-helper-autoremove.fake-dpkg index aec6d4418..a365c5370 100644 --- a/test/integration/test-kernel-helper-autoremove.fake-dpkg +++ b/test/integration/test-kernel-helper-autoremove.fake-dpkg @@ -3,7 +3,7 @@ set -e if [ "$1" = "-l" ]; then echo "ii linux-image-1.0.0-2-generic 1.0.01-2 amd64" - echo "ii linux-image-3.5.0-17-generic 3.5.0-17 amd64" + echo "ii linux-image-$(uname -r) not-used amd64" echo "ii linux-image-10.0.0-1-generic 10.0.0.1-1 amd64" elif [ "$1" = "--compare-versions" ]; then dpkg "$1" "$2" "$3" "$4" -- cgit v1.2.3 From d27a691d72c8cc07767e92ae94bdfe391d9e9513 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 5 Nov 2012 12:32:50 -0800 Subject: typo fix --- test/integration/test-kernel-helper-autoremove | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove index 4c0571b13..52fa01bc5 100755 --- a/test/integration/test-kernel-helper-autoremove +++ b/test/integration/test-kernel-helper-autoremove @@ -28,7 +28,7 @@ sh ${TESTDIR}/../../debian/apt.auto-removal.sh # and ensure its there, valid and version 10.0.0-1 is there too test -e $TMPDIR/apt.conf.d/01autoremove-kernels apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic\.\*" -# ... and also that the running kernel is exlucded +# ... and also that the running kernel is excluded apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)\.\*" # done -- cgit v1.2.3 From c6918c16c7b98fe709b4f7af5fa1c43f201fb1af Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 5 Nov 2012 13:11:39 -0800 Subject: Make the test more verbose and check for the negative case of a kernel that should not be marked not-for-autoremoval --- test/integration/test-kernel-helper-autoremove | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove index 52fa01bc5..37c1b6a43 100755 --- a/test/integration/test-kernel-helper-autoremove +++ b/test/integration/test-kernel-helper-autoremove @@ -25,11 +25,18 @@ install -m755 $TESTDIR/test-kernel-helper-autoremove.fake-dpkg $TMPDIR/fake-dpkg # run the helper sh ${TESTDIR}/../../debian/apt.auto-removal.sh +msgtest 'Check that kernel autoremoval list is correctly created' # and ensure its there, valid and version 10.0.0-1 is there too -test -e $TMPDIR/apt.conf.d/01autoremove-kernels -apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic\.\*" +test -e $TMPDIR/apt.conf.d/01autoremove-kernels && msgpass || msgfail + +msgtest 'Check that most recent kernel is saved from autoremoval' +apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic\.\*" && msgpass || msgfail + # ... and also that the running kernel is excluded -apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)\.\*" +msgtest 'Check that running kernel is saved from autoremoval' +apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)\.\*" && msgpass || msgfail +# and that the old kernel is *not* excluded from autoremoval +msgtest 'Check that older kernels are not excluded from autoremoval' +apt-config -c ${APT_CONFIG} dump | grep -q "APT::NeverAutoRemove::.*\^linux-image-1\.0\.0-2-generic\.\*" && msgfail || msgpass # done -msgpass -- cgit v1.2.3 From d269b88d95686b77a170af203d0f4a7e44d28fc8 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 5 Nov 2012 14:44:59 -0800 Subject: Additional test for the case when installed version != newest version --- test/integration/test-kernel-helper-autoremove | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove index 37c1b6a43..ffcd3963a 100755 --- a/test/integration/test-kernel-helper-autoremove +++ b/test/integration/test-kernel-helper-autoremove @@ -23,7 +23,7 @@ export APT_CONFIG install -m755 $TESTDIR/test-kernel-helper-autoremove.fake-dpkg $TMPDIR/fake-dpkg # run the helper -sh ${TESTDIR}/../../debian/apt.auto-removal.sh +sh ${TESTDIR}/../../debian/apt.auto-removal.sh msgtest 'Check that kernel autoremoval list is correctly created' # and ensure its there, valid and version 10.0.0-1 is there too @@ -38,5 +38,18 @@ apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image- # and that the old kernel is *not* excluded from autoremoval msgtest 'Check that older kernels are not excluded from autoremoval' -apt-config -c ${APT_CONFIG} dump | grep -q "APT::NeverAutoRemove::.*\^linux-image-1\.0\.0-2-generic\.\*" && msgfail || msgpass +apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-1\.0\.01-2-generic\.\*" && msgfail || msgpass + +msgtest "Check that the older kernel is retained when it's being installed" +sh ${TESTDIR}/../../debian/apt.auto-removal.sh 1.0.01-2-generic +test -e $TMPDIR/apt.conf.d/01autoremove-kernels +if ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic\.\*" \ + || ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)\.\*" \ + || ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-1\.0\.01-2-generic\.\*" +then + msgfail +else + msgpass +fi + # done -- cgit v1.2.3 From f2f53128c01f0620ab21c312cd6601d903aaae3c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 14 Feb 2014 22:01:35 +0100 Subject: fix the test-kernel-helper-autoremove testcase --- test/integration/test-kernel-helper-autoremove | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove index ffcd3963a..2b165d100 100755 --- a/test/integration/test-kernel-helper-autoremove +++ b/test/integration/test-kernel-helper-autoremove @@ -30,22 +30,22 @@ msgtest 'Check that kernel autoremoval list is correctly created' test -e $TMPDIR/apt.conf.d/01autoremove-kernels && msgpass || msgfail msgtest 'Check that most recent kernel is saved from autoremoval' -apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic\.\*" && msgpass || msgfail +apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic" && msgpass || msgfail # ... and also that the running kernel is excluded msgtest 'Check that running kernel is saved from autoremoval' -apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)\.\*" && msgpass || msgfail +apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)" && msgpass || msgfail # and that the old kernel is *not* excluded from autoremoval msgtest 'Check that older kernels are not excluded from autoremoval' -apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-1\.0\.01-2-generic\.\*" && msgfail || msgpass +apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-1\.0\.01-2-generic" && msgfail || msgpass msgtest "Check that the older kernel is retained when it's being installed" sh ${TESTDIR}/../../debian/apt.auto-removal.sh 1.0.01-2-generic test -e $TMPDIR/apt.conf.d/01autoremove-kernels -if ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic\.\*" \ - || ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)\.\*" \ - || ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-1\.0\.01-2-generic\.\*" +if ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic" \ + || ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)" \ + || ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-1\.0\.01-2-generic" then msgfail else -- cgit v1.2.3 From 18cce3980f34dc33f9c798204a344a8c1e4de6ba Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 14 Feb 2014 18:35:35 +0100 Subject: honor option to disable pulses for the testcases Git-Dch: Ignore --- apt-private/acqprogress.cc | 7 +++++-- apt-private/acqprogress.h | 2 +- test/integration/test-bug-738785-switch-protocol | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc index af2d0f461..d25ffef75 100644 --- a/apt-private/acqprogress.cc +++ b/apt-private/acqprogress.cc @@ -30,10 +30,13 @@ using namespace std; // AcqTextStatus::AcqTextStatus - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet) : - ScreenWidth(ScreenWidth), ID(0), Quiet(Quiet) +AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet) : + pkgAcquireStatus(), ScreenWidth(ScreenWidth), ID(0), Quiet(Quiet) { BlankLine[0] = 0; + // testcases use it to disable pulses without disabling other user messages + if (Quiet == 0 && _config->FindB("quiet::NoUpdate", false) == true) + this->Quiet = 1; } /*}}}*/ // AcqTextStatus::Start - Downloading has started /*{{{*/ diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h index e47bfb72d..e12dafe50 100644 --- a/apt-private/acqprogress.h +++ b/apt-private/acqprogress.h @@ -32,7 +32,7 @@ class AcqTextStatus : public pkgAcquireStatus bool Pulse(pkgAcquire *Owner); - AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet); + AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet); }; #endif diff --git a/test/integration/test-bug-738785-switch-protocol b/test/integration/test-bug-738785-switch-protocol index bc3c6dbad..b51be244a 100755 --- a/test/integration/test-bug-738785-switch-protocol +++ b/test/integration/test-bug-738785-switch-protocol @@ -48,5 +48,6 @@ rm https cd - >/dev/null echo "Dir::Bin::Methods \"${COPYMETHODS}\";" >> aptconfig.conf -aptget download apt +testequal "E: The method driver $(pwd)/rootdir/usr/lib/apt/methods/https could not be found. +N: Is the package apt-transport-https installed?" aptget download apt -q=0 testsuccess test ! -e apt_1.0_all.deb -- cgit v1.2.3 From 755d1e4f94f3a862adc951d3732c661906cd555d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 14 Feb 2014 18:59:46 +0100 Subject: =?UTF-8?q?add=20a=20testcase=20to=20check=20for=20forbidden=20htt?= =?UTF-8?q?ps=E2=86=92http=20downgrades?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Git-Dch: Ignore --- methods/https.cc | 3 ++- test/integration/framework | 2 +- test/integration/test-bug-738785-switch-protocol | 12 +++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/methods/https.cc b/methods/https.cc index 9422df2f0..e713be19f 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -188,7 +188,8 @@ bool HttpsMethod::Fetch(FetchItem *Itm) // options curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false); curl_easy_setopt(curl, CURLOPT_FILETIME, true); - // only allow redirects to https + // only allow curl to handle https, not the other stuff it supports + curl_easy_setopt(curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS); curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS); // SSL parameters are set by default to the common (non mirror-specific) value diff --git a/test/integration/framework b/test/integration/framework index e4f018472..08d796a10 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1119,7 +1119,7 @@ testfailure() { if [ "$1" = '--nomsg' ]; then shift else - msgtest 'Test for failure in execution of' "$*" + msgtest 'Test for failure in execution of' "$*" fi local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output" if $@ >${OUTPUT} 2>&1; then diff --git a/test/integration/test-bug-738785-switch-protocol b/test/integration/test-bug-738785-switch-protocol index b51be244a..1e5748eae 100755 --- a/test/integration/test-bug-738785-switch-protocol +++ b/test/integration/test-bug-738785-switch-protocol @@ -12,6 +12,7 @@ buildsimplenativepackage 'apt' 'all' '1.0' 'stable' # setup http redirecting to https setupaptarchive --no-update changetowebserver -o 'aptwebserver::redirect::replace::/redirectme/=https://localhost:4433/' \ + -o 'aptwebserver::redirect::replace::/downgrademe/=http://localhost:8080/' \ -o 'aptwebserver::support::http=false' changetohttpswebserver sed -i -e 's#:4433/#:8080/redirectme#' -e 's# https:# http:#' rootdir/etc/apt/sources.list.d/* @@ -38,7 +39,7 @@ testdpkginstalled 'apt' # create a copy of all methods, expect https eval `aptconfig shell METHODS Dir::Bin::Methods/d` COPYMETHODS='usr/lib/apt/methods' -rm rootdir/$COPYMETHODS +mv rootdir/${COPYMETHODS} rootdir/${COPYMETHODS}.bak mkdir -p rootdir/$COPYMETHODS cd rootdir/$COPYMETHODS find $METHODS \! -type d | while read meth; do @@ -51,3 +52,12 @@ echo "Dir::Bin::Methods \"${COPYMETHODS}\";" >> aptconfig.conf testequal "E: The method driver $(pwd)/rootdir/usr/lib/apt/methods/https could not be found. N: Is the package apt-transport-https installed?" aptget download apt -q=0 testsuccess test ! -e apt_1.0_all.deb + +# revert to all methods +rm -rf rootdir/$COPYMETHODS +mv rootdir/${COPYMETHODS}.bak rootdir/${COPYMETHODS} + +# check that downgrades from https to http are not allowed +webserverconfig 'aptwebserver::support::http' 'true' +sed -i -e 's#:8080/redirectme#:4433/downgrademe#' -e 's# http:# https:#' rootdir/etc/apt/sources.list.d/* +testfailure aptget update -- cgit v1.2.3 From 4c90bc28889b9570096148e18e4433d18ab51a12 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 14 Feb 2014 22:20:17 +0100 Subject: update symbols file with hints from the buildlogs --- debian/libapt-pkg4.12.symbols | 41 +++++++++++++++++++++++++++-------------- prepare-release | 24 ++++++++++++++++++------ 2 files changed, 45 insertions(+), 20 deletions(-) diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index 3236d227a..17b9f69fa 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -15,7 +15,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"ReadPinFile(pkgPolicy&, std::basic_string, std::allocator >)@Base" 0.8.0 (c++)"RegexChoice(RxChoiceList*, char const**, char const**)@Base" 0.8.0 (c++)"SetNonBlock(int, bool)@Base" 0.8.0 - (c++)"TimeRFC1123(long)@Base" 0.8.0 (c++)"flExtension(std::basic_string, std::allocator >)@Base" 0.8.0 (c++)"Base64Encode(std::basic_string, std::allocator > const&)@Base" 0.8.0 (c++)"ReadMessages(int, std::vector, std::allocator >, std::allocator, std::allocator > > >&)@Base" 0.8.0 @@ -50,8 +49,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"DirectoryExists(std::basic_string, std::allocator > const&)@Base" 0.8.0 (c++)"VectorizeString(std::basic_string, std::allocator > const&, char const&)@Base" 0.8.0 (c++)"pkgPrioSortList(pkgCache&, pkgCache::Version**)@Base" 0.8.0 - (c++)"FTPMDTMStrToTime(char const*, long&)@Base" 0.8.0 - (c++)"RFC1123StrToTime(char const*, long&)@Base" 0.8.0 (c++)"pkgMakeStatusCache(pkgSourceList&, OpProgress&, MMap**, bool)@Base" 0.8.0 (c++)"pkgMinimizeUpgrade(pkgDepCache&)@Base" 0.8.0 (c++)"GetListOfFilesInDir(std::basic_string, std::allocator > const&, std::vector, std::allocator >, std::allocator, std::allocator > > > const&, bool const&)@Base" 0.8.0 @@ -72,7 +69,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"IsMounted(std::basic_string, std::allocator >&)@Base" 0.8.0 (c++)"LookupTag(std::basic_string, std::allocator > const&, char const*, char const*)@Base" 0.8.0 (c++)"SizeToStr(double)@Base" 0.8.0 - (c++)"StrToTime(std::basic_string, std::allocator > const&, long&)@Base" 0.8.0 (c++)"TFRewrite(_IO_FILE*, pkgTagSection const&, char const**, TFRewriteData*)@Base" 0.8.0 (c++)"TimeToStr(unsigned long)@Base" 0.8.0 (c++)"_strstrip(char*)@Base" 0.8.0 @@ -91,7 +87,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"guard variable for pkgCacheGenerator::Dynamic::toReMap@Base" 0.8.0 (c++)"HashString::SupportedHashes()@Base" 0.8.0 (c++)"HashString::_SupportedHashes@Base" 0.8.0 - (c++)"HashString::HashString(HashString const&)@Base" 0.8.0 (c++)"HashString::HashString(std::basic_string, std::allocator >)@Base" 0.8.0 (c++)"HashString::HashString(std::basic_string, std::allocator >, std::basic_string, std::allocator >)@Base" 0.8.0 (c++)"HashString::HashString()@Base" 0.8.0 @@ -1125,31 +1120,42 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# pkgVersion@Base 0.8.0 ### architecture specific: va_list (arch=armel armhf|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, std::__va_list&) const@Base" 0.8.15~exp1 - (arch=i386 hurd-i386 kfreebsd-i386|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, char*&) const@Base" 0.8.15~exp1 + (arch=i386 hurd-i386 kfreebsd-i386 ppc64|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, char*&) const@Base" 0.8.15~exp1 (arch=hppa ia64 mips mipsel sparc sparc64|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, void*&) const@Base" 0.8.15~exp1 - (arch=amd64 kfreebsd-amd64 powerpc powerpcspe s390|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __va_list_tag (&) [1]) const@Base" 0.8.15~exp1 + (arch=amd64 kfreebsd-amd64 powerpc powerpcspe s390 s390x x32|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __va_list_tag (&) [1]) const@Base" 0.8.15~exp1 (arch=sh4|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __builtin_va_list&) const@Base" 0.8.15~exp1 (arch=alpha|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __va_list_tag&) const@Base" 0.8.15~exp1 ### architecture specific: va_list & size_t (arch=i386 hurd-i386 kfreebsd-i386|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, char*&, unsigned int&)@Base" 0.8.11.4 (arch=armel armhf|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, std::__va_list&, unsigned int&)@Base" 0.8.11.4 (arch=alpha|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag&, unsigned long&)@Base" 0.8.11.4 - (arch=powerpc powerpcspe|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned int&)@Base" 0.8.11.4 - (arch=amd64 kfreebsd-amd64 s390|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned long&)@Base" 0.8.11.4 + (arch=powerpc powerpcspe x32|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned int&)@Base" 0.8.11.4 + (arch=amd64 kfreebsd-amd64 s390 s390x|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned long&)@Base" 0.8.11.4 (arch=hppa mips mipsel sparc|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned int&)@Base" 0.8.11.4 (arch=ia64 sparc64|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned long&)@Base" 0.8.11.4 (arch=sh4|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __builtin_va_list&, unsigned int&)@Base" 0.8.11.4 + (arch=ppc64|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, char*&, unsigned long&)@Base" 0.8.11.4 (arch=i386 hurd-i386 kfreebsd-i386|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, char*&, int, unsigned int&)@Base" 0.8.11.4 (arch=armel armhf|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, std::__va_list&, int, unsigned int&)@Base" 0.8.11.4 (arch=alpha|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag&, int, unsigned long&)@Base" 0.8.11.4 - (arch=powerpc powerpcspe|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned int&)@Base" 0.8.11.4 - (arch=amd64 kfreebsd-amd64 s390|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned long&)@Base" 0.8.11.4 + (arch=powerpc powerpcspe x32|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned int&)@Base" 0.8.11.4 + (arch=amd64 kfreebsd-amd64 s390 s390x|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned long&)@Base" 0.8.11.4 (arch=hppa mips mipsel sparc|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned int&)@Base" 0.8.11.4 (arch=ia64 sparc64|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned long&)@Base" 0.8.11.4 1 (arch=sh4|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __builtin_va_list&, int, unsigned int&)@Base" 0.8.11.4 + (arch=ppc64|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, char*&, int, unsigned long&)@Base" 0.8.11.4 ### architecture specific: size_t - (arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mips mipsel powerpc powerpcspe sh4 sparc|c++)"_strtabexpand(char*, unsigned int)@Base" 0.8.0 - (arch=alpha amd64 ia64 kfreebsd-amd64 s390 sparc64|c++)"_strtabexpand(char*, unsigned long)@Base" 0.8.0 + (arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mips mipsel powerpc powerpcspe sh4 sparc x32|c++)"_strtabexpand(char*, unsigned int)@Base" 0.8.0 + (arch=alpha amd64 ia64 kfreebsd-amd64 s390 s390x sparc64 ppc64|c++)"_strtabexpand(char*, unsigned long)@Base" 0.8.0 +### architecture specific: time_t + (arch=!x32|c++)"TimeRFC1123(long)@Base" 0.8.0 + (arch=x32|c++)"TimeRFC1123(long long)@Base" 0.8.0 + (arch=!x32|c++)"FTPMDTMStrToTime(char const*, long&)@Base" 0.8.0 + (arch=x32|c++)"FTPMDTMStrToTime(char const*, long long&)@Base" 0.8.0 + (arch=!x32|c++)"StrToTime(std::basic_string, std::allocator > const&, long&)@Base" 0.8.0 + (arch=x32|c++)"StrToTime(std::basic_string, std::allocator > const&, long long&)@Base" 0.8.0 + (arch=!x32|c++)"RFC1123StrToTime(char const*, long&)@Base" 0.8.0 + (arch=x32|c++)"RFC1123StrToTime(char const*, long long&)@Base" 0.8.0 ### (c++)"Configuration::MatchAgainstConfig::clearPatterns()@Base" 0.8.1 (c++)"CreateAPTDirectoryIfNeeded(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&)@Base" 0.8.2 @@ -1589,13 +1595,19 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++|optional=private)"pkgCdrom::MountAndIdentCDROM(Configuration&, std::basic_string, std::allocator >&, std::basic_string, std::allocator >&, pkgCdromStatus*)@Base" 0.9.15.2 ### demangle strangeness - buildd report it as MISSING and as new… (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 0.8.0 -### gcc artefacts +### gcc-4.6 artefacts + (c++|optional=implicit)"HashString::operator=(HashString const&)@Base" 0.8.0 + (c++|optional=implicit)"HashString::HashString(HashString const&)@Base" 0.8.0 + (c++|optional=inline)"APT::VersionContainer > >::iterator std::max_element > >::iterator, CompareProviders>(APT::VersionContainer > >::iterator, APT::VersionContainer > >::iterator, CompareProviders)@Base" 0.8.0 + (c++|optional=inline)"pkgCache::VerIterator::ParentPkg() const@Base" 0.8.0 +### std library artefacts (c++|regex|optional=std)"^std::vector::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0 (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct<__gnu_cxx::__normal_iterator, std::allocator > > >(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct<__gnu_cxx::__normal_iterator, std::allocator > > >(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct(char const*, char const*, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct(char*, char*, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 + (c++|optional=std)"std::basic_string, std::allocator >& std::basic_string, std::allocator >::_M_replace_dispatch(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, unsigned char*, unsigned char*, std::__false_type)@Base" 0.8.0 ### try to ignore std:: template instances (c++|regex|optional=std)"^(void |)std::[^ ]+<.+ >::(_|~).+\(.*\)@Base$" 0.8.0 (c++|regex|optional=std)"^std::[^ ]+<.+ >::(append|insert|reserve|operator[^ ]+)\(.*\)@Base$" 0.8.0 @@ -1603,6 +1615,7 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++|regex|optional=std)"^(bool|void) std::(operator|sort_heap|make_heap)[^ ]+<.+ >\(.+\)@Base$" 0.8.0 (c++|regex|optional=std)"^std::reverse_iterator<.+ > std::__.+@Base$" 0.8.0 (c++|regex|optional=std)"^std::basic_string<.+ >\(.+\)@Base$" 0.8.0 + (c++|regex|optional=std)"^std::basic_string<.+ >::basic_string<.+>\(.+\)@Base$" 0.8.0 (c++|regex|optional=std)"^__gnu_cxx::__[^ ]+<.*@Base$" 0.8.0 (c++|regex|optional=std)"^typeinfo name for std::iterator<.*>@Base$" 0.8.0 (c++|regex|optional=std)"^typeinfo for std::iterator<.*>@Base$" 0.8.0 diff --git a/prepare-release b/prepare-release index dfa37631b..6141ce6e4 100755 --- a/prepare-release +++ b/prepare-release @@ -13,6 +13,18 @@ DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/init.h | sed 's/\.$//')" LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)" +librarysymbolsfromfile() { + local MISSING="$(grep '^+#MISSING' "$1")" + echo '=== Missing optional symbols:' + echo -n "$MISSING" | grep '|optional=' || true + echo '=== Missing required symbols:' + echo -n "$MISSING" | grep -v '|optional=' || true + echo '=== New symbols:' + grep '^+ ' "$1" | cut -d' ' -f 2 | cut -d'@' -f 1 | c++filt | while read line; do + echo " (c++)\"${line}@Base\" $VERSION" + done | sort -u +} + if [ "$1" = 'pre-export' ]; then libraryversioncheck() { local LIBRARY="$1" @@ -78,17 +90,17 @@ elif [ "$1" = 'library' ]; then echo "Checking $1 in version $2" local tmpfile=$(mktemp) dpkg-gensymbols -p${1}${2} -ebuild/bin/${1}.so.${2} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile || true - echo '=== Missing symbols:' - grep '^+#MISSING' $tmpfile || true - echo '=== New symbols:' - grep '^+ ' $tmpfile | cut -d' ' -f 2 | cut -d'@' -f 1 | c++filt | while read line; do - echo " (c++)\"${line}@Base\" $VERSION" - done | sort -u + librarysymbolsfromfile "$tmpfile" rm -f $tmpfile } librarysymbols 'libapt-pkg' "${LIBAPTPKGVERSION}" echo librarysymbols 'libapt-inst' "${LIBAPTINSTVERSION}" +elif [ "$1" = 'buildlog' ]; then + while [ -n "$2" ]; do + librarysymbolsfromfile "$2" + shift + done else echo >&1 "Usage:\t$0 pre-export \t$0 post-build -- cgit v1.2.3 From c255de478459f7b5051b3394abe0b6b632c7423c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 20 Feb 2014 09:08:59 +0100 Subject: prepare release --- debian/changelog | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/debian/changelog b/debian/changelog index 22624bcaa..5ee108b1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +apt (0.9.15.3) UNRELEASED; urgency=medium + + [ Michael Vogt ] + * disable https->http redirects in libcurl, thanks to Julien Cristau + * ADT: use "Restrictions: allow-stderr and avoid apt-stderr.log in + debian/tests/run-tests + * test/integration/test-bug-723705-tagfile-truncates-fields: + - fix autopkgtest failure + * add missing canNotFindFnmatch/showFnmatchSelection + (for the next ABI break) + * disable fnmatch() matching from the commandline + * merge testcase for the autoremove feature from the ubuntu branch + + [ David Kalnischkies ] + * do not recommend dselect in apt-get manpage (Closes: 617625) + * report https download start only if we really get it + * allow http protocol to switch to https + * do not compress .xhtml files and remove junk files (Closes: 738933) + * simplify code some more to make reddit happy + * update symbols file with hints from the buildlogs + + -- Michael Vogt Thu, 20 Feb 2014 09:05:15 +0100 + apt (0.9.15.2) unstable; urgency=medium [ Michael Vogt ] -- cgit v1.2.3 From 7e75a619f6d35c492c1341096096432109facfc5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 20 Feb 2014 14:41:24 +0100 Subject: prepare re-enable fnmatch() once we have proper reporting --- apt-pkg/cacheset.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index eab1e09f8..6b6fdb5ad 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -312,6 +312,9 @@ bool PackageContainerInterface::FromString(PackageContainerInterface * const pci if (FromGroup(pci, Cache, str, helper) == false && FromTask(pci, Cache, str, helper) == false && +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) + FromFnmatch(pci, Cache, str, helper) == false) +#endif FromRegEx(pci, Cache, str, helper) == false) { helper.canNotFindPackage(pci, Cache, str); -- cgit v1.2.3 From 1c93747533dcf1cbbb2c743d0028ad157a7684a4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 20 Feb 2014 14:42:50 +0100 Subject: releasing package apt version 0.9.15.3 --- configure.ac | 2 +- debian/changelog | 4 +- doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 111 +++++++++++++++++++-------------------- doc/po/de.po | 144 +++++++++++++++++++++++++++++++-------------------- doc/po/es.po | 144 +++++++++++++++++++++++++++++++-------------------- doc/po/fr.po | 144 +++++++++++++++++++++++++++++++-------------------- doc/po/it.po | 144 +++++++++++++++++++++++++++++++-------------------- doc/po/ja.po | 144 +++++++++++++++++++++++++++++++-------------------- doc/po/pl.po | 144 +++++++++++++++++++++++++++++++-------------------- doc/po/pt.po | 144 +++++++++++++++++++++++++++++++-------------------- doc/po/pt_BR.po | 111 +++++++++++++++++++-------------------- po/ar.po | 71 ++++++++++++++----------- po/ast.po | 71 ++++++++++++++----------- po/bg.po | 71 ++++++++++++++----------- po/bs.po | 71 ++++++++++++++----------- po/ca.po | 71 ++++++++++++++----------- po/cs.po | 71 ++++++++++++++----------- po/cy.po | 71 ++++++++++++++----------- po/da.po | 71 ++++++++++++++----------- po/de.po | 71 ++++++++++++++----------- po/dz.po | 71 ++++++++++++++----------- po/el.po | 71 ++++++++++++++----------- po/es.po | 71 ++++++++++++++----------- po/eu.po | 71 ++++++++++++++----------- po/fi.po | 71 ++++++++++++++----------- po/fr.po | 73 +++++++++++++++----------- po/gl.po | 71 ++++++++++++++----------- po/hu.po | 71 ++++++++++++++----------- po/it.po | 72 +++++++++++++++----------- po/ja.po | 72 +++++++++++++++----------- po/km.po | 71 ++++++++++++++----------- po/ko.po | 71 ++++++++++++++----------- po/ku.po | 71 ++++++++++++++----------- po/lt.po | 71 ++++++++++++++----------- po/mr.po | 71 ++++++++++++++----------- po/nb.po | 71 ++++++++++++++----------- po/ne.po | 71 ++++++++++++++----------- po/nl.po | 71 ++++++++++++++----------- po/nn.po | 71 ++++++++++++++----------- po/pl.po | 72 +++++++++++++++----------- po/pt.po | 71 ++++++++++++++----------- po/pt_BR.po | 71 ++++++++++++++----------- po/ro.po | 71 ++++++++++++++----------- po/ru.po | 71 ++++++++++++++----------- po/sk.po | 71 ++++++++++++++----------- po/sl.po | 71 ++++++++++++++----------- po/sv.po | 71 ++++++++++++++----------- po/th.po | 71 ++++++++++++++----------- po/tl.po | 71 ++++++++++++++----------- po/tr.po | 71 ++++++++++++++----------- po/uk.po | 71 ++++++++++++++----------- po/vi.po | 72 +++++++++++++++----------- po/zh_CN.po | 71 ++++++++++++++----------- po/zh_TW.po | 71 ++++++++++++++----------- 55 files changed, 2490 insertions(+), 1807 deletions(-) diff --git a/configure.ac b/configure.ac index de784a76b..a5a9fe0b8 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="0.9.15.2" +PACKAGE_VERSION="0.9.15.3" PACKAGE_MAIL="APT Development Team " AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index 5ee108b1d..0780118ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.15.3) UNRELEASED; urgency=medium +apt (0.9.15.3) unstable; urgency=medium [ Michael Vogt ] * disable https->http redirects in libcurl, thanks to Julien Cristau @@ -19,7 +19,7 @@ apt (0.9.15.3) UNRELEASED; urgency=medium * simplify code some more to make reddit happy * update symbols file with hints from the buildlogs - -- Michael Vogt Thu, 20 Feb 2014 09:05:15 +0100 + -- Michael Vogt Thu, 20 Feb 2014 14:42:39 +0100 apt (0.9.15.2) unstable; urgency=medium diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index cadcc27ae..966ca2b0f 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -219,7 +219,7 @@ "> - + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index d0973638a..8e63cdfc0 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.15.2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -521,8 +521,8 @@ msgstr "" msgid "" "apt-get is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " -"library. Several \"front-end\" interfaces exist, such as &dselect;, " -"&aptitude;, &synaptic; and &wajig;." +"library. Several \"front-end\" interfaces exist, such as &aptitude;, " +"&synaptic; and &wajig;." msgstr "" #. type: Content of: @@ -753,14 +753,11 @@ msgid "" "clean clears out the local repository of retrieved " "package files. It removes everything but the lock file from " "&cachedir;/archives/ and " -"&cachedir;/archives/partial/. When APT is used as a " -"&dselect; method, clean is run automatically. Those who " -"do not use dselect will likely want to run apt-get clean " -"from time to time to free up disk space." +"&cachedir;/archives/partial/." msgstr "" #. type: Content of: -#: apt-get.8.xml:227 +#: apt-get.8.xml:224 msgid "" "Like clean, autoclean clears out the " "local repository of retrieved package files. The difference is that it only " @@ -772,7 +769,7 @@ msgid "" msgstr "" #. type: Content of: -#: apt-get.8.xml:237 +#: apt-get.8.xml:234 msgid "" "autoremove is used to remove packages that were " "automatically installed to satisfy dependencies for other packages and are " @@ -780,7 +777,7 @@ msgid "" msgstr "" #. type: Content of: -#: apt-get.8.xml:242 +#: apt-get.8.xml:239 msgid "" "changelog downloads a package changelog and displays it " "through sensible-pager. The server name and base " @@ -795,33 +792,33 @@ msgid "" msgstr "" #. type: Content of: -#: apt-get.8.xml:260 apt-cache.8.xml:250 apt-mark.8.xml:110 apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50 apt-ftparchive.1.xml:506 +#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110 apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50 apt-ftparchive.1.xml:506 msgid "options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:265 +#: apt-get.8.xml:262 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:270 +#: apt-get.8.xml:267 msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:275 +#: apt-get.8.xml:272 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:280 +#: apt-get.8.xml:277 msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -830,14 +827,14 @@ msgid "" "running APT for the first time; APT itself does not allow broken package " "dependencies to exist on a system. It is possible that a system's dependency " "structure can be so corrupt as to require manual intervention (which usually " -"means using &dselect; or <command>dpkg --remove</command> to eliminate some " -"of the offending packages). Use of this option together with " -"<option>-m</option> may produce an error in some situations. Configuration " -"Item: <literal>APT::Get::Fix-Broken</literal>." +"means using <command>dpkg --remove</command> to eliminate some of the " +"offending packages). Use of this option together with <option>-m</option> " +"may produce an error in some situations. Configuration Item: " +"<literal>APT::Get::Fix-Broken</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:295 +#: apt-get.8.xml:292 msgid "" "Ignore missing packages; if packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -849,7 +846,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:306 +#: apt-get.8.xml:303 msgid "" "Disables downloading of packages. This is best used with " "<option>--ignore-missing</option> to force APT to use only the .debs it has " @@ -858,7 +855,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:310 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -870,7 +867,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:328 +#: apt-get.8.xml:325 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: " @@ -878,7 +875,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:332 +#: apt-get.8.xml:329 msgid "" "Simulated runs performed as a user will automatically deactivate locking " "(<literal>Debug::NoLocking</literal>), and if the option " @@ -890,7 +887,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:340 +#: apt-get.8.xml:337 msgid "" "Simulated runs print out a series of lines, each representing a " "<command>dpkg</command> operation: configure (<literal>Conf</literal>), " @@ -900,7 +897,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:348 +#: apt-get.8.xml:345 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -910,28 +907,28 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:356 +#: apt-get.8.xml:353 msgid "" "Automatic \"no\" to all prompts. Configuration Item: " "<literal>APT::Get::Assume-No</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:361 +#: apt-get.8.xml:358 msgid "" "Show upgraded packages; print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:367 +#: apt-get.8.xml:364 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:373 +#: apt-get.8.xml:370 msgid "" "This option controls the architecture packages are built for by " "<command>apt-get source --compile</command> and how cross-builddependencies " @@ -942,14 +939,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:383 +#: apt-get.8.xml:380 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:388 +#: apt-get.8.xml:385 msgid "" "Ignore package holds; this causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -958,7 +955,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:395 +#: apt-get.8.xml:392 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -970,7 +967,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:404 msgid "" "Do not upgrade packages; when used in conjunction with " "<literal>install</literal>, <literal>no-upgrade</literal> will prevent " @@ -979,7 +976,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:414 +#: apt-get.8.xml:411 msgid "" "Do not install new packages; when used in conjunction with " "<literal>install</literal>, <literal>only-upgrade</literal> will install " @@ -989,7 +986,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:422 +#: apt-get.8.xml:419 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 " @@ -999,7 +996,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:430 +#: apt-get.8.xml:427 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected MD5 " @@ -1012,7 +1009,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:441 +#: apt-get.8.xml:438 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be " @@ -1022,14 +1019,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:449 +#: apt-get.8.xml:446 msgid "" "Re-install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:454 +#: apt-get.8.xml:451 msgid "" "This option is on by default; use <literal>--no-list-cleanup</literal> to " "turn it off. When it is on, <command>apt-get</command> will automatically " @@ -1040,7 +1037,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:461 msgid "" "This option controls the default input to the policy engine; it creates a " "default pin at priority 990 using the specified release string. This " @@ -1055,7 +1052,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:479 +#: apt-get.8.xml:476 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where " @@ -1065,14 +1062,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:486 +#: apt-get.8.xml:483 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:492 +#: apt-get.8.xml:489 msgid "" "If the command is either <literal>install</literal> or " "<literal>remove</literal>, then this option acts like running the " @@ -1081,7 +1078,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:499 +#: apt-get.8.xml:496 msgid "" "Only has meaning for the <literal>source</literal> and " "<literal>build-dep</literal> commands. Indicates that the given source " @@ -1093,7 +1090,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:510 +#: apt-get.8.xml:507 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, " @@ -1102,14 +1099,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:516 +#: apt-get.8.xml:513 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:521 +#: apt-get.8.xml:518 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: " @@ -1117,7 +1114,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:527 +#: apt-get.8.xml:524 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1127,30 +1124,30 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:540 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 apt.conf.5.xml:1200 apt_preferences.5.xml:700 +#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 apt.conf.5.xml:1200 apt_preferences.5.xml:700 msgid "Files" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 apt-ftparchive.1.xml:609 +#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 apt-ftparchive.1.xml:609 msgid "See Also" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:551 +#: apt-get.8.xml:548 msgid "" -"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " -"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, " -"&apt-preferences;, the APT Howto." +"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, " +"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the " +"APT Howto." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:556 apt-cache.8.xml:357 apt-mark.8.xml:137 apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76 apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613 +#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76 apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613 msgid "Diagnostics" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:557 +#: apt-get.8.xml:554 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." diff --git a/doc/po/de.po b/doc/po/de.po index 69f018966..5afea89ca 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.14.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 09:53+0100\n" +"POT-Creation-Date: 2014-02-20 14:42+0100\n" "PO-Revision-Date: 2014-01-26 15:26+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -643,11 +643,17 @@ msgstr "Beschreibung" #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:41 +#, fuzzy +#| msgid "" +#| "<command>apt-get</command> is the command-line tool for handling " +#| "packages, and may be considered the user's \"back-end\" to other tools " +#| "using the APT library. Several \"front-end\" interfaces exist, such as " +#| "&dselect;, &aptitude;, &synaptic; and &wajig;." msgid "" "<command>apt-get</command> is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " -"library. Several \"front-end\" interfaces exist, such as &dselect;, " -"&aptitude;, &synaptic; and &wajig;." +"library. Several \"front-end\" interfaces exist, such as &aptitude;, " +"&synaptic; and &wajig;." msgstr "" "<command>apt-get</command> ist ein Befehlszeilenwerkzeug zur Handhabung von " "Paketen und könnte als »Backend« anderer Werkzeugen betrachtet werden, die " @@ -1004,14 +1010,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:217 +#, fuzzy +#| msgid "" +#| "<literal>clean</literal> clears out the local repository of retrieved " +#| "package files. It removes everything but the lock file from " +#| "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/" +#| "archives/partial/</filename>. When APT is used as a &dselect; method, " +#| "<literal>clean</literal> is run automatically. Those who do not use " +#| "dselect will likely want to run <literal>apt-get clean</literal> from " +#| "time to time to free up disk space." msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/archives/" -"partial/</filename>. When APT is used as a &dselect; method, <literal>clean</" -"literal> is run automatically. Those who do not use dselect will likely " -"want to run <literal>apt-get clean</literal> from time to time to free up " -"disk space." +"partial/</filename>." msgstr "" "<literal>clean</literal> bereinigt das lokale Depot von heruntergeladenen " "Paketdateien. Es entfernt alles außer der Sperrdatei aus " @@ -1022,7 +1034,7 @@ msgstr "" "Zeit zu Zeit ausführen, um Plattenplatz freizugeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:227 +#: apt-get.8.xml:224 msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -1042,7 +1054,7 @@ msgstr "" "sie auf »off« gesetzt ist." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:237 +#: apt-get.8.xml:234 msgid "" "<literal>autoremove</literal> is used to remove packages that were " "automatically installed to satisfy dependencies for other packages and are " @@ -1053,7 +1065,7 @@ msgstr "" "erfüllen und die nicht mehr benötigt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:242 +#: apt-get.8.xml:239 msgid "" "<literal>changelog</literal> downloads a package changelog and displays it " "through <command>sensible-pager</command>. The server name and base " @@ -1076,14 +1088,14 @@ msgstr "" "Befehl <option>install</option> angeben." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:260 apt-cache.8.xml:250 apt-mark.8.xml:110 +#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110 #: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50 #: apt-ftparchive.1.xml:506 msgid "options" msgstr "Optionen" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:265 +#: apt-get.8.xml:262 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." @@ -1092,7 +1104,7 @@ msgstr "" "Konfigurationselement: <literal>APT::Install-Recommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:270 +#: apt-get.8.xml:267 msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." @@ -1101,7 +1113,7 @@ msgstr "" "Konfigurationselement: <literal>APT::Install-Suggests</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:275 +#: apt-get.8.xml:272 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." @@ -1111,7 +1123,20 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:280 +#: apt-get.8.xml:277 +#, fuzzy +#| msgid "" +#| "Fix; attempt to correct a system with broken dependencies in place. This " +#| "option, when used with install/remove, can omit any packages to permit " +#| "APT to deduce a likely solution. If packages are specified, these have to " +#| "completely correct the problem. The option is sometimes necessary when " +#| "running APT for the first time; APT itself does not allow broken package " +#| "dependencies to exist on a system. It is possible that a system's " +#| "dependency structure can be so corrupt as to require manual intervention " +#| "(which usually means using &dselect; or <command>dpkg --remove</command> " +#| "to eliminate some of the offending packages). Use of this option together " +#| "with <option>-m</option> may produce an error in some situations. " +#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>." msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -1120,10 +1145,10 @@ msgid "" "running APT for the first time; APT itself does not allow broken package " "dependencies to exist on a system. It is possible that a system's dependency " "structure can be so corrupt as to require manual intervention (which usually " -"means using &dselect; or <command>dpkg --remove</command> to eliminate some " -"of the offending packages). Use of this option together with <option>-m</" -"option> may produce an error in some situations. Configuration Item: " -"<literal>APT::Get::Fix-Broken</literal>." +"means using <command>dpkg --remove</command> to eliminate some of the " +"offending packages). Use of this option together with <option>-m</option> " +"may produce an error in some situations. Configuration Item: <literal>APT::" +"Get::Fix-Broken</literal>." msgstr "" "beheben; versucht ein System von vorhandenen beschädigten Abhängigkeiten zu " "korrigieren. Diese Option kann, wenn sie mit »install«/»remove« benutzt " @@ -1140,7 +1165,7 @@ msgstr "" "Konfigurationselement: <literal>APT::Get::Fix-Broken</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:295 +#: apt-get.8.xml:292 msgid "" "Ignore missing packages; if packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -1161,7 +1186,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:306 +#: apt-get.8.xml:303 msgid "" "Disables downloading of packages. This is best used with <option>--ignore-" "missing</option> to force APT to use only the .debs it has already " @@ -1173,7 +1198,7 @@ msgstr "" "<literal>APT::Get::Download</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:310 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -1193,7 +1218,7 @@ msgstr "" "Konfigurationselement: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:328 +#: apt-get.8.xml:325 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: <literal>APT::Get::" @@ -1204,7 +1229,7 @@ msgstr "" "<literal>APT::Get::Simulate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:332 +#: apt-get.8.xml:329 msgid "" "Simulated runs performed as a user will automatically deactivate locking " "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::" @@ -1224,7 +1249,7 @@ msgstr "" "wissen, was sie tun." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:340 +#: apt-get.8.xml:337 msgid "" "Simulated runs print out a series of lines, each representing a " "<command>dpkg</command> operation: configure (<literal>Conf</literal>), " @@ -1239,7 +1264,7 @@ msgstr "" "eckiger Klammern bedeutet Unterbrechungen, die keine Folgen haben (selten)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:348 +#: apt-get.8.xml:345 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -1255,7 +1280,7 @@ msgstr "" "Get::Assume-Yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:356 +#: apt-get.8.xml:353 msgid "" "Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::" "Assume-No</literal>." @@ -1264,7 +1289,7 @@ msgstr "" "Get::Assume-No</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:361 +#: apt-get.8.xml:358 msgid "" "Show upgraded packages; print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." @@ -1274,7 +1299,7 @@ msgstr "" "Konfigurationselement: <literal>APT::Get::Show-Upgraded</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:367 +#: apt-get.8.xml:364 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." @@ -1284,7 +1309,7 @@ msgstr "" "Versions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:373 +#: apt-get.8.xml:370 msgid "" "This option controls the architecture packages are built for by <command>apt-" "get source --compile</command> and how cross-builddependencies are " @@ -1301,7 +1326,7 @@ msgstr "" "Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:383 +#: apt-get.8.xml:380 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -1310,7 +1335,7 @@ msgstr "" "Konfigurationselement: <literal>APT::Get::Compile</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:388 +#: apt-get.8.xml:385 msgid "" "Ignore package holds; this causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -1324,7 +1349,7 @@ msgstr "" "<literal>APT::Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:395 +#: apt-get.8.xml:392 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -1344,7 +1369,7 @@ msgstr "" "wird.Konfigurationselement: <literal>APT::Get::Upgrade-Allow-New</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:404 msgid "" "Do not upgrade packages; when used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -1358,7 +1383,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:414 +#: apt-get.8.xml:411 msgid "" "Do not install new packages; when used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will install upgrades for already " @@ -1372,7 +1397,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:422 +#: apt-get.8.xml:419 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 " @@ -1387,7 +1412,7 @@ msgstr "" "zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:430 +#: apt-get.8.xml:427 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected MD5 " @@ -1409,7 +1434,7 @@ msgstr "" "Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:441 +#: apt-get.8.xml:438 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -1422,7 +1447,7 @@ msgstr "" "option>. Konfigurationselement: <literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:449 +#: apt-get.8.xml:446 msgid "" "Re-install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -1431,7 +1456,7 @@ msgstr "" "Version haben. Konfigurationselement: <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:454 +#: apt-get.8.xml:451 msgid "" "This option is on by default; use <literal>--no-list-cleanup</literal> to " "turn it off. When it is on, <command>apt-get</command> will automatically " @@ -1449,7 +1474,7 @@ msgstr "" "Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:461 msgid "" "This option controls the default input to the policy engine; it creates a " "default pin at priority 990 using the specified release string. This " @@ -1474,7 +1499,7 @@ msgstr "" "auch die &apt-preferences;-Handbuchseite." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:479 +#: apt-get.8.xml:476 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where <option>--assume-yes</" @@ -1488,7 +1513,7 @@ msgstr "" "Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:486 +#: apt-get.8.xml:483 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -1497,7 +1522,7 @@ msgstr "" "Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:492 +#: apt-get.8.xml:489 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running the <literal>autoremove</" @@ -1511,7 +1536,7 @@ msgstr "" "AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:499 +#: apt-get.8.xml:496 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -1530,7 +1555,7 @@ msgstr "" "Get::Only-Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:510 +#: apt-get.8.xml:507 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -1542,7 +1567,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:516 +#: apt-get.8.xml:513 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -1551,7 +1576,7 @@ msgstr "" "Konfigurationselement: <literal>APT::Get::Arch-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:521 +#: apt-get.8.xml:518 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -1563,7 +1588,7 @@ msgstr "" # FIXME s/Item/Items/ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:527 +#: apt-get.8.xml:524 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1579,13 +1604,13 @@ msgstr "" "<literal>Dpkg::Progress-Fancy</literal>." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:540 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 +#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 #: apt.conf.5.xml:1200 apt_preferences.5.xml:700 msgid "Files" msgstr "Dateien" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 +#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 #: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 #: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 @@ -1594,25 +1619,30 @@ msgid "See Also" msgstr "Siehe auch" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:551 +#: apt-get.8.xml:548 +#, fuzzy +#| msgid "" +#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" +#| "preferences;, the APT Howto." msgid "" -"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " -"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" -"preferences;, the APT Howto." +"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, " +"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the " +"APT Howto." msgstr "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, die APT-Benutzeranleitung in &guidesdir;, &apt-" "preferences;, das APT-Howto." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:556 apt-cache.8.xml:357 apt-mark.8.xml:137 +#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 #: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76 #: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613 msgid "Diagnostics" msgstr "Diagnose" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:557 +#: apt-get.8.xml:554 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." diff --git a/doc/po/es.po b/doc/po/es.po index 213c704b1..5c49f7485 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 09:53+0100\n" +"POT-Creation-Date: 2014-02-20 14:42+0100\n" "PO-Revision-Date: 2012-07-14 12:21+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -728,11 +728,17 @@ msgstr "Descripción" #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:41 +#, fuzzy +#| msgid "" +#| "<command>apt-get</command> is the command-line tool for handling " +#| "packages, and may be considered the user's \"back-end\" to other tools " +#| "using the APT library. Several \"front-end\" interfaces exist, such as " +#| "&dselect;, &aptitude;, &synaptic; and &wajig;." msgid "" "<command>apt-get</command> is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " -"library. Several \"front-end\" interfaces exist, such as &dselect;, " -"&aptitude;, &synaptic; and &wajig;." +"library. Several \"front-end\" interfaces exist, such as &aptitude;, " +"&synaptic; and &wajig;." msgstr "" "<command>apt-get</command> es la herramienta para la gestión de paquetes " "desde la línea de órdenes, y se puede considerar el sistema de «bajo nivel» " @@ -1085,14 +1091,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:217 +#, fuzzy +#| msgid "" +#| "<literal>clean</literal> clears out the local repository of retrieved " +#| "package files. It removes everything but the lock file from " +#| "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/" +#| "archives/partial/</filename>. When APT is used as a &dselect; method, " +#| "<literal>clean</literal> is run automatically. Those who do not use " +#| "dselect will likely want to run <literal>apt-get clean</literal> from " +#| "time to time to free up disk space." msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/archives/" -"partial/</filename>. When APT is used as a &dselect; method, <literal>clean</" -"literal> is run automatically. Those who do not use dselect will likely " -"want to run <literal>apt-get clean</literal> from time to time to free up " -"disk space." +"partial/</filename>." msgstr "" "<literal>clean</literal> borra totalmente el repositorio local que contiene " "los ficheros de los paquetes descargados. Borra todo excepto el fichero de " @@ -1103,7 +1115,7 @@ msgstr "" "literal> de vez en cuando para liberar algo de espacio en disco." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:227 +#: apt-get.8.xml:224 msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -1122,7 +1134,7 @@ msgstr "" "desactivada impedirá que se borren los paquetes instalados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:237 +#: apt-get.8.xml:234 msgid "" "<literal>autoremove</literal> is used to remove packages that were " "automatically installed to satisfy dependencies for other packages and are " @@ -1133,7 +1145,7 @@ msgstr "" "ya no son necesarios." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:242 +#: apt-get.8.xml:239 msgid "" "<literal>changelog</literal> downloads a package changelog and displays it " "through <command>sensible-pager</command>. The server name and base " @@ -1157,14 +1169,14 @@ msgstr "" "option>." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:260 apt-cache.8.xml:250 apt-mark.8.xml:110 +#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110 #: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50 #: apt-ftparchive.1.xml:506 msgid "options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:265 +#: apt-get.8.xml:262 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." @@ -1173,7 +1185,7 @@ msgstr "" "de configuración: <literal>APT::Install-Recommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:270 +#: apt-get.8.xml:267 msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." @@ -1182,7 +1194,7 @@ msgstr "" "instalar. Opción de configuración: <literal>APT::Install-Suggests</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:275 +#: apt-get.8.xml:272 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." @@ -1191,7 +1203,20 @@ msgstr "" "instala. Opción de configuración: <literal>APT::Get::Download-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:280 +#: apt-get.8.xml:277 +#, fuzzy +#| msgid "" +#| "Fix; attempt to correct a system with broken dependencies in place. This " +#| "option, when used with install/remove, can omit any packages to permit " +#| "APT to deduce a likely solution. If packages are specified, these have to " +#| "completely correct the problem. The option is sometimes necessary when " +#| "running APT for the first time; APT itself does not allow broken package " +#| "dependencies to exist on a system. It is possible that a system's " +#| "dependency structure can be so corrupt as to require manual intervention " +#| "(which usually means using &dselect; or <command>dpkg --remove</command> " +#| "to eliminate some of the offending packages). Use of this option together " +#| "with <option>-m</option> may produce an error in some situations. " +#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>." msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -1200,10 +1225,10 @@ msgid "" "running APT for the first time; APT itself does not allow broken package " "dependencies to exist on a system. It is possible that a system's dependency " "structure can be so corrupt as to require manual intervention (which usually " -"means using &dselect; or <command>dpkg --remove</command> to eliminate some " -"of the offending packages). Use of this option together with <option>-m</" -"option> may produce an error in some situations. Configuration Item: " -"<literal>APT::Get::Fix-Broken</literal>." +"means using <command>dpkg --remove</command> to eliminate some of the " +"offending packages). Use of this option together with <option>-m</option> " +"may produce an error in some situations. Configuration Item: <literal>APT::" +"Get::Fix-Broken</literal>." msgstr "" "Intenta arreglar un sistema con dependencias actualmente rotas. Si se usa " "esta opción junto a «install»/«remove» se puede omitir cualquier paquete " @@ -1219,7 +1244,7 @@ msgstr "" "<literal>APT::Get::Fix-Broken</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:295 +#: apt-get.8.xml:292 msgid "" "Ignore missing packages; if packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -1239,7 +1264,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:306 +#: apt-get.8.xml:303 msgid "" "Disables downloading of packages. This is best used with <option>--ignore-" "missing</option> to force APT to use only the .debs it has already " @@ -1251,7 +1276,7 @@ msgstr "" "<literal>APT::Get::Download</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:310 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -1271,7 +1296,7 @@ msgstr "" "no espera. Opción de configuración: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:328 +#: apt-get.8.xml:325 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: <literal>APT::Get::" @@ -1282,7 +1307,7 @@ msgstr "" "Simulate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:332 +#: apt-get.8.xml:329 msgid "" "Simulated runs performed as a user will automatically deactivate locking " "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::" @@ -1301,7 +1326,7 @@ msgstr "" "acciones sin avisos de <literal>apt-get</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:340 +#: apt-get.8.xml:337 msgid "" "Simulated runs print out a series of lines, each representing a " "<command>dpkg</command> operation: configure (<literal>Conf</literal>), " @@ -1317,7 +1342,7 @@ msgstr "" "(poco frecuente)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:348 +#: apt-get.8.xml:345 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -1333,7 +1358,7 @@ msgstr "" "<literal>APT::Get::Assume-Yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:356 +#: apt-get.8.xml:353 msgid "" "Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::" "Assume-No</literal>." @@ -1342,7 +1367,7 @@ msgstr "" "Get::Assume-No</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:361 +#: apt-get.8.xml:358 msgid "" "Show upgraded packages; print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." @@ -1351,7 +1376,7 @@ msgstr "" "<literal>APT::Get::Show-Upgraded</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:367 +#: apt-get.8.xml:364 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." @@ -1360,7 +1385,7 @@ msgstr "" "Opción de configuración: <literal>APT::Get::Show-Versions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:373 +#: apt-get.8.xml:370 msgid "" "This option controls the architecture packages are built for by <command>apt-" "get source --compile</command> and how cross-builddependencies are " @@ -1377,7 +1402,7 @@ msgstr "" "configuración: <literal>APT::Get::Host-Architecture</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:383 +#: apt-get.8.xml:380 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -1386,7 +1411,7 @@ msgstr "" "<literal>APT::Get::Compile</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:388 +#: apt-get.8.xml:385 msgid "" "Ignore package holds; this causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -1400,7 +1425,7 @@ msgstr "" "Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:395 +#: apt-get.8.xml:392 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -1412,7 +1437,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:404 msgid "" "Do not upgrade packages; when used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -1425,7 +1450,7 @@ msgstr "" "configuración: <literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:414 +#: apt-get.8.xml:411 msgid "" "Do not install new packages; when used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will install upgrades for already " @@ -1439,7 +1464,7 @@ msgstr "" "<literal>APT::Get::Only-Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:422 +#: apt-get.8.xml:419 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 " @@ -1455,7 +1480,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:430 +#: apt-get.8.xml:427 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected MD5 " @@ -1477,7 +1502,7 @@ msgstr "" "<literal>APT::Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:441 +#: apt-get.8.xml:438 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -1491,7 +1516,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:449 +#: apt-get.8.xml:446 msgid "" "Re-install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -1501,7 +1526,7 @@ msgstr "" "ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:454 +#: apt-get.8.xml:451 msgid "" "This option is on by default; use <literal>--no-list-cleanup</literal> to " "turn it off. When it is on, <command>apt-get</command> will automatically " @@ -1519,7 +1544,7 @@ msgstr "" "<literal>APT::Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:461 msgid "" "This option controls the default input to the policy engine; it creates a " "default pin at priority 990 using the specified release string. This " @@ -1543,7 +1568,7 @@ msgstr "" "también la página del manual de &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:479 +#: apt-get.8.xml:476 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where <option>--assume-yes</" @@ -1557,7 +1582,7 @@ msgstr "" "<literal>APT::Get::Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:486 +#: apt-get.8.xml:483 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -1566,7 +1591,7 @@ msgstr "" "preguntar. Opción de configuración: <literal>APT::Get::Remove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:492 +#: apt-get.8.xml:489 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running the <literal>autoremove</" @@ -1579,7 +1604,7 @@ msgstr "" "Get::AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:499 +#: apt-get.8.xml:496 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -1599,7 +1624,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:510 +#: apt-get.8.xml:507 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -1610,7 +1635,7 @@ msgstr "" "Dsc-Only</literal> y <literal>APT::Get::Tar-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:516 +#: apt-get.8.xml:513 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -1619,7 +1644,7 @@ msgstr "" "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:521 +#: apt-get.8.xml:518 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -1630,7 +1655,7 @@ msgstr "" "configuración: <literal>APT::Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:527 +#: apt-get.8.xml:524 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1640,13 +1665,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:540 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 +#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 #: apt.conf.5.xml:1200 apt_preferences.5.xml:700 msgid "Files" msgstr "Ficheros" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 +#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 #: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 #: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 @@ -1655,25 +1680,30 @@ msgid "See Also" msgstr "Véase también" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:551 +#: apt-get.8.xml:548 +#, fuzzy +#| msgid "" +#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" +#| "preferences;, the APT Howto." msgid "" -"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " -"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" -"preferences;, the APT Howto." +"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, " +"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the " +"APT Howto." msgstr "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, la guía de usuario de APT en &guidesdir;, &apt-" "preferences;, el Cómo de APT." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:556 apt-cache.8.xml:357 apt-mark.8.xml:137 +#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 #: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76 #: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613 msgid "Diagnostics" msgstr "Diagnósticos" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:557 +#: apt-get.8.xml:554 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." diff --git a/doc/po/fr.po b/doc/po/fr.po index 0a240192a..09b70a66f 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 09:53+0100\n" +"POT-Creation-Date: 2014-02-20 14:42+0100\n" "PO-Revision-Date: 2013-04-09 07:56+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -639,11 +639,17 @@ msgstr "Description" #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:41 +#, fuzzy +#| msgid "" +#| "<command>apt-get</command> is the command-line tool for handling " +#| "packages, and may be considered the user's \"back-end\" to other tools " +#| "using the APT library. Several \"front-end\" interfaces exist, such as " +#| "&dselect;, &aptitude;, &synaptic; and &wajig;." msgid "" "<command>apt-get</command> is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " -"library. Several \"front-end\" interfaces exist, such as &dselect;, " -"&aptitude;, &synaptic; and &wajig;." +"library. Several \"front-end\" interfaces exist, such as &aptitude;, " +"&synaptic; and &wajig;." msgstr "" "<command>Apt-get</command> est le programme en ligne de commande pour la " "gestion des paquets. Il peut être considéré comme l'outil de base pour les " @@ -998,14 +1004,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:217 +#, fuzzy +#| msgid "" +#| "<literal>clean</literal> clears out the local repository of retrieved " +#| "package files. It removes everything but the lock file from " +#| "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/" +#| "archives/partial/</filename>. When APT is used as a &dselect; method, " +#| "<literal>clean</literal> is run automatically. Those who do not use " +#| "dselect will likely want to run <literal>apt-get clean</literal> from " +#| "time to time to free up disk space." msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/archives/" -"partial/</filename>. When APT is used as a &dselect; method, <literal>clean</" -"literal> is run automatically. Those who do not use dselect will likely " -"want to run <literal>apt-get clean</literal> from time to time to free up " -"disk space." +"partial/</filename>." msgstr "" "La commande <literal>clean</literal> nettoie le référentiel local des " "paquets récupérés. Elle supprime tout, excepté le fichier de verrou situé " @@ -1016,7 +1028,7 @@ msgstr "" "temps en temps si l'on veut libérer de l'espace disque." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:227 +#: apt-get.8.xml:224 msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -1035,7 +1047,7 @@ msgstr "" "installés." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:237 +#: apt-get.8.xml:234 msgid "" "<literal>autoremove</literal> is used to remove packages that were " "automatically installed to satisfy dependencies for other packages and are " @@ -1046,7 +1058,7 @@ msgstr "" "ne sont plus nécessaires." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:242 +#: apt-get.8.xml:239 msgid "" "<literal>changelog</literal> downloads a package changelog and displays it " "through <command>sensible-pager</command>. The server name and base " @@ -1070,14 +1082,14 @@ msgstr "" "<option>install</option>." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:260 apt-cache.8.xml:250 apt-mark.8.xml:110 +#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110 #: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50 #: apt-ftparchive.1.xml:506 msgid "options" msgstr "options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:265 +#: apt-get.8.xml:262 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." @@ -1086,7 +1098,7 @@ msgstr "" "Élément de configuration : <literal>APT::Install-Recommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:270 +#: apt-get.8.xml:267 msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." @@ -1095,7 +1107,7 @@ msgstr "" "de configuration : <literal>APT::Install-Suggests</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:275 +#: apt-get.8.xml:272 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." @@ -1105,7 +1117,20 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:280 +#: apt-get.8.xml:277 +#, fuzzy +#| msgid "" +#| "Fix; attempt to correct a system with broken dependencies in place. This " +#| "option, when used with install/remove, can omit any packages to permit " +#| "APT to deduce a likely solution. If packages are specified, these have to " +#| "completely correct the problem. The option is sometimes necessary when " +#| "running APT for the first time; APT itself does not allow broken package " +#| "dependencies to exist on a system. It is possible that a system's " +#| "dependency structure can be so corrupt as to require manual intervention " +#| "(which usually means using &dselect; or <command>dpkg --remove</command> " +#| "to eliminate some of the offending packages). Use of this option together " +#| "with <option>-m</option> may produce an error in some situations. " +#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>." msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -1114,10 +1139,10 @@ msgid "" "running APT for the first time; APT itself does not allow broken package " "dependencies to exist on a system. It is possible that a system's dependency " "structure can be so corrupt as to require manual intervention (which usually " -"means using &dselect; or <command>dpkg --remove</command> to eliminate some " -"of the offending packages). Use of this option together with <option>-m</" -"option> may produce an error in some situations. Configuration Item: " -"<literal>APT::Get::Fix-Broken</literal>." +"means using <command>dpkg --remove</command> to eliminate some of the " +"offending packages). Use of this option together with <option>-m</option> " +"may produce an error in some situations. Configuration Item: <literal>APT::" +"Get::Fix-Broken</literal>." msgstr "" "Correction ; cette option demande de réparer un système où existent des " "dépendances défectueuses. Utilisée avec install ou remove, elle peut exclure " @@ -1133,7 +1158,7 @@ msgstr "" "configuration : <literal>APT::Get::Fix-Broken</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:295 +#: apt-get.8.xml:292 msgid "" "Ignore missing packages; if packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -1153,7 +1178,7 @@ msgstr "" "<literal>APT::Get::Fix-Missing</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:306 +#: apt-get.8.xml:303 msgid "" "Disables downloading of packages. This is best used with <option>--ignore-" "missing</option> to force APT to use only the .debs it has already " @@ -1165,7 +1190,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:310 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -1187,7 +1212,7 @@ msgstr "" "configuration : <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:328 +#: apt-get.8.xml:325 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: <literal>APT::Get::" @@ -1198,7 +1223,7 @@ msgstr "" "<literal>APT::Get::Simulate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:332 +#: apt-get.8.xml:329 msgid "" "Simulated runs performed as a user will automatically deactivate locking " "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::" @@ -1219,7 +1244,7 @@ msgstr "" "notifications)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:340 +#: apt-get.8.xml:337 msgid "" "Simulated runs print out a series of lines, each representing a " "<command>dpkg</command> operation: configure (<literal>Conf</literal>), " @@ -1234,7 +1259,7 @@ msgstr "" "que les dommages n'ont aucune conséquence (rare)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:348 +#: apt-get.8.xml:345 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -1250,7 +1275,7 @@ msgstr "" "configuration : <literal>APT::Get::Assume-Yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:356 +#: apt-get.8.xml:353 msgid "" "Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::" "Assume-No</literal>." @@ -1259,7 +1284,7 @@ msgstr "" "configuration : <literal>APT::Get::Assume-No</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:361 +#: apt-get.8.xml:358 msgid "" "Show upgraded packages; print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." @@ -1269,7 +1294,7 @@ msgstr "" "Upgraded</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:367 +#: apt-get.8.xml:364 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." @@ -1278,7 +1303,7 @@ msgstr "" "Élément de configuration : <literal>APT::Get::Show-Versions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:373 +#: apt-get.8.xml:370 msgid "" "This option controls the architecture packages are built for by <command>apt-" "get source --compile</command> and how cross-builddependencies are " @@ -1296,7 +1321,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:383 +#: apt-get.8.xml:380 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -1305,7 +1330,7 @@ msgstr "" "configuration : <literal>APT::Get::Compile</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:388 +#: apt-get.8.xml:385 msgid "" "Ignore package holds; this causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -1319,7 +1344,7 @@ msgstr "" "<literal>APT::Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:395 +#: apt-get.8.xml:392 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -1331,7 +1356,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:404 msgid "" "Do not upgrade packages; when used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -1344,7 +1369,7 @@ msgstr "" "Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:414 +#: apt-get.8.xml:411 msgid "" "Do not install new packages; when used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will install upgrades for already " @@ -1357,7 +1382,7 @@ msgstr "" "configuration : <literal>APT::Get::Only-Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:422 +#: apt-get.8.xml:419 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 " @@ -1373,7 +1398,7 @@ msgstr "" "yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:430 +#: apt-get.8.xml:427 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected MD5 " @@ -1395,7 +1420,7 @@ msgstr "" "<literal>APT::Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:441 +#: apt-get.8.xml:438 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -1409,7 +1434,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:449 +#: apt-get.8.xml:446 msgid "" "Re-install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -1418,7 +1443,7 @@ msgstr "" "Élément de configuration : <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:454 +#: apt-get.8.xml:451 msgid "" "This option is on by default; use <literal>--no-list-cleanup</literal> to " "turn it off. When it is on, <command>apt-get</command> will automatically " @@ -1436,7 +1461,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:461 msgid "" "This option controls the default input to the policy engine; it creates a " "default pin at priority 990 using the specified release string. This " @@ -1458,7 +1483,7 @@ msgstr "" "Release</literal>. Voyez aussi la page de manuel d'&apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:479 +#: apt-get.8.xml:476 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where <option>--assume-yes</" @@ -1472,7 +1497,7 @@ msgstr "" "Get::Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:486 +#: apt-get.8.xml:483 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -1482,7 +1507,7 @@ msgstr "" "Remove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:492 +#: apt-get.8.xml:489 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running the <literal>autoremove</" @@ -1495,7 +1520,7 @@ msgstr "" "inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:499 +#: apt-get.8.xml:496 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -1515,7 +1540,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:510 +#: apt-get.8.xml:507 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -1527,7 +1552,7 @@ msgstr "" "literal>, " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:516 +#: apt-get.8.xml:513 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -1537,7 +1562,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:521 +#: apt-get.8.xml:518 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -1549,7 +1574,7 @@ msgstr "" "AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:527 +#: apt-get.8.xml:524 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1559,13 +1584,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:540 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 +#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 #: apt.conf.5.xml:1200 apt_preferences.5.xml:700 msgid "Files" msgstr "Fichiers" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 +#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 #: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 #: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 @@ -1574,25 +1599,30 @@ msgid "See Also" msgstr "Voir aussi" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:551 +#: apt-get.8.xml:548 +#, fuzzy +#| msgid "" +#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" +#| "preferences;, the APT Howto." msgid "" -"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " -"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" -"preferences;, the APT Howto." +"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, " +"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the " +"APT Howto." msgstr "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, le guide d'APT dans &guidesdir;, &apt-preferences;, le " "« HOWTO » d'APT." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:556 apt-cache.8.xml:357 apt-mark.8.xml:137 +#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 #: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76 #: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613 msgid "Diagnostics" msgstr "Diagnostics" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:557 +#: apt-get.8.xml:554 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." diff --git a/doc/po/it.po b/doc/po/it.po index 23d39d156..30bbf8b11 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 09:53+0100\n" +"POT-Creation-Date: 2014-02-20 14:42+0100\n" "PO-Revision-Date: 2012-12-23 18:04+0200\n" "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" @@ -692,11 +692,17 @@ msgstr "Descrizione" #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:41 +#, fuzzy +#| msgid "" +#| "<command>apt-get</command> is the command-line tool for handling " +#| "packages, and may be considered the user's \"back-end\" to other tools " +#| "using the APT library. Several \"front-end\" interfaces exist, such as " +#| "&dselect;, &aptitude;, &synaptic; and &wajig;." msgid "" "<command>apt-get</command> is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " -"library. Several \"front-end\" interfaces exist, such as &dselect;, " -"&aptitude;, &synaptic; and &wajig;." +"library. Several \"front-end\" interfaces exist, such as &aptitude;, " +"&synaptic; and &wajig;." msgstr "" "<command>apt-get</command> è lo strumento a riga di comando per gestire " "pacchetti e può essere considerato il «backend» dell'utente per altri " @@ -1050,14 +1056,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:217 +#, fuzzy +#| msgid "" +#| "<literal>clean</literal> clears out the local repository of retrieved " +#| "package files. It removes everything but the lock file from " +#| "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/" +#| "archives/partial/</filename>. When APT is used as a &dselect; method, " +#| "<literal>clean</literal> is run automatically. Those who do not use " +#| "dselect will likely want to run <literal>apt-get clean</literal> from " +#| "time to time to free up disk space." msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/archives/" -"partial/</filename>. When APT is used as a &dselect; method, <literal>clean</" -"literal> is run automatically. Those who do not use dselect will likely " -"want to run <literal>apt-get clean</literal> from time to time to free up " -"disk space." +"partial/</filename>." msgstr "" "<literal>clean</literal> ripulisce il repository locale dei file di " "pacchetto recuperati. Rimuove tutto da <filename>&cachedir;/archives/</" @@ -1068,7 +1080,7 @@ msgstr "" "quando per liberare spazio su disco." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:227 +#: apt-get.8.xml:224 msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -1087,7 +1099,7 @@ msgstr "" "impedisce che vengano eliminati i pacchetti installati." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:237 +#: apt-get.8.xml:234 msgid "" "<literal>autoremove</literal> is used to remove packages that were " "automatically installed to satisfy dependencies for other packages and are " @@ -1098,7 +1110,7 @@ msgstr "" "pacchetti e che non sono più necessari." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:242 +#: apt-get.8.xml:239 msgid "" "<literal>changelog</literal> downloads a package changelog and displays it " "through <command>sensible-pager</command>. The server name and base " @@ -1121,14 +1133,14 @@ msgstr "" "opzioni del comando <option>install</option>." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:260 apt-cache.8.xml:250 apt-mark.8.xml:110 +#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110 #: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50 #: apt-ftparchive.1.xml:506 msgid "options" msgstr "opzioni" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:265 +#: apt-get.8.xml:262 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." @@ -1138,7 +1150,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:270 +#: apt-get.8.xml:267 msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." @@ -1147,7 +1159,7 @@ msgstr "" "Voce di configurazione:<literal>APT::Install-Suggests</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:275 +#: apt-get.8.xml:272 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." @@ -1157,7 +1169,20 @@ msgstr "" "Download-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:280 +#: apt-get.8.xml:277 +#, fuzzy +#| msgid "" +#| "Fix; attempt to correct a system with broken dependencies in place. This " +#| "option, when used with install/remove, can omit any packages to permit " +#| "APT to deduce a likely solution. If packages are specified, these have to " +#| "completely correct the problem. The option is sometimes necessary when " +#| "running APT for the first time; APT itself does not allow broken package " +#| "dependencies to exist on a system. It is possible that a system's " +#| "dependency structure can be so corrupt as to require manual intervention " +#| "(which usually means using &dselect; or <command>dpkg --remove</command> " +#| "to eliminate some of the offending packages). Use of this option together " +#| "with <option>-m</option> may produce an error in some situations. " +#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>." msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -1166,10 +1191,10 @@ msgid "" "running APT for the first time; APT itself does not allow broken package " "dependencies to exist on a system. It is possible that a system's dependency " "structure can be so corrupt as to require manual intervention (which usually " -"means using &dselect; or <command>dpkg --remove</command> to eliminate some " -"of the offending packages). Use of this option together with <option>-m</" -"option> may produce an error in some situations. Configuration Item: " -"<literal>APT::Get::Fix-Broken</literal>." +"means using <command>dpkg --remove</command> to eliminate some of the " +"offending packages). Use of this option together with <option>-m</option> " +"may produce an error in some situations. Configuration Item: <literal>APT::" +"Get::Fix-Broken</literal>." msgstr "" "Aggiusta; cerca di correggere un sistema che ha dipendenze non soddisfatte. " "Questa opzione, quando usata con install o remove, può omettere qualsiasi " @@ -1185,7 +1210,7 @@ msgstr "" "Voce di configurazione: <literal>APT::Get::Fix-Broken</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:295 +#: apt-get.8.xml:292 msgid "" "Ignore missing packages; if packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -1205,7 +1230,7 @@ msgstr "" "configurazione: <literal>APT::Get::Fix-Missing</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:306 +#: apt-get.8.xml:303 msgid "" "Disables downloading of packages. This is best used with <option>--ignore-" "missing</option> to force APT to use only the .debs it has already " @@ -1216,7 +1241,7 @@ msgstr "" "scaricato. Voce di configurazione: <literal>APT::Get::Download</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:310 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -1236,7 +1261,7 @@ msgstr "" "qualcosa di inatteso. Voce di configurazione: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:328 +#: apt-get.8.xml:325 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: <literal>APT::Get::" @@ -1247,7 +1272,7 @@ msgstr "" "configurazione: <literal>APT::Get::Simulate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:332 +#: apt-get.8.xml:329 msgid "" "Simulated runs performed as a user will automatically deactivate locking " "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::" @@ -1266,7 +1291,7 @@ msgstr "" "bisogno di ulteriori avvertimenti da <literal>apt-get</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:340 +#: apt-get.8.xml:337 msgid "" "Simulated runs print out a series of lines, each representing a " "<command>dpkg</command> operation: configure (<literal>Conf</literal>), " @@ -1282,7 +1307,7 @@ msgstr "" "hanno conseguenze (rari)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:348 +#: apt-get.8.xml:345 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -1299,7 +1324,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:356 +#: apt-get.8.xml:353 msgid "" "Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::" "Assume-No</literal>." @@ -1308,7 +1333,7 @@ msgstr "" "<literal>APT::Get::Assume-No</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:361 +#: apt-get.8.xml:358 msgid "" "Show upgraded packages; print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." @@ -1318,7 +1343,7 @@ msgstr "" "Upgraded</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:367 +#: apt-get.8.xml:364 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." @@ -1327,7 +1352,7 @@ msgstr "" "configurazione: <literal>APT::Get::Show-Versions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:373 +#: apt-get.8.xml:370 msgid "" "This option controls the architecture packages are built for by <command>apt-" "get source --compile</command> and how cross-builddependencies are " @@ -1344,7 +1369,7 @@ msgstr "" "di configurazione: <literal>APT::Get::Host-Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:383 +#: apt-get.8.xml:380 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -1353,7 +1378,7 @@ msgstr "" "<literal>APT::Get::Compile</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:388 +#: apt-get.8.xml:385 msgid "" "Ignore package holds; this causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -1366,7 +1391,7 @@ msgstr "" "non desiderati. Voce di configurazione: <literal>APT::Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:395 +#: apt-get.8.xml:392 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -1378,7 +1403,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:404 msgid "" "Do not upgrade packages; when used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -1391,7 +1416,7 @@ msgstr "" "configurazione: <literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:414 +#: apt-get.8.xml:411 msgid "" "Do not install new packages; when used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will install upgrades for already " @@ -1405,7 +1430,7 @@ msgstr "" "Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:422 +#: apt-get.8.xml:419 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 " @@ -1421,7 +1446,7 @@ msgstr "" "yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:430 +#: apt-get.8.xml:427 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected MD5 " @@ -1442,7 +1467,7 @@ msgstr "" "configurazione: <literal>APT::Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:441 +#: apt-get.8.xml:438 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -1455,7 +1480,7 @@ msgstr "" "option>. Voce di configurazione: <literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:449 +#: apt-get.8.xml:446 msgid "" "Re-install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -1464,7 +1489,7 @@ msgstr "" "configurazione: <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:454 +#: apt-get.8.xml:451 msgid "" "This option is on by default; use <literal>--no-list-cleanup</literal> to " "turn it off. When it is on, <command>apt-get</command> will automatically " @@ -1481,7 +1506,7 @@ msgstr "" "fonti. Voce di configurazione: <literal>APT::Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:461 msgid "" "This option controls the default input to the policy engine; it creates a " "default pin at priority 990 using the specified release string. This " @@ -1505,7 +1530,7 @@ msgstr "" "pagina di manuale di &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:479 +#: apt-get.8.xml:476 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where <option>--assume-yes</" @@ -1519,7 +1544,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:486 +#: apt-get.8.xml:483 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -1529,7 +1554,7 @@ msgstr "" "Get::Remove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:492 +#: apt-get.8.xml:489 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running the <literal>autoremove</" @@ -1543,7 +1568,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:499 +#: apt-get.8.xml:496 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -1562,7 +1587,7 @@ msgstr "" "configurazione: <literal>APT::Get::Only-Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:510 +#: apt-get.8.xml:507 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -1573,7 +1598,7 @@ msgstr "" "Dsc-Only</literal> e <literal>APT::Get::Tar-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:516 +#: apt-get.8.xml:513 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -1582,7 +1607,7 @@ msgstr "" "Voce di configurazione: <literal>APT::Get::Arch-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:521 +#: apt-get.8.xml:518 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -1593,7 +1618,7 @@ msgstr "" "configurazione: <literal>APT::Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:527 +#: apt-get.8.xml:524 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1603,13 +1628,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:540 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 +#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 #: apt.conf.5.xml:1200 apt_preferences.5.xml:700 msgid "Files" msgstr "File" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 +#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 #: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 #: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 @@ -1618,25 +1643,30 @@ msgid "See Also" msgstr "Vedere anche" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:551 +#: apt-get.8.xml:548 +#, fuzzy +#| msgid "" +#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" +#| "preferences;, the APT Howto." msgid "" -"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " -"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" -"preferences;, the APT Howto." +"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, " +"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the " +"APT Howto." msgstr "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, la Guida dell'utente di APT in &guidesdir;, &apt-" "preferences;, l'APT Howto." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:556 apt-cache.8.xml:357 apt-mark.8.xml:137 +#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 #: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76 #: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613 msgid "Diagnostics" msgstr "Diagnostica" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:557 +#: apt-get.8.xml:554 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." diff --git a/doc/po/ja.po b/doc/po/ja.po index 3b78ee69b..7fd447ef9 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 09:53+0100\n" +"POT-Creation-Date: 2014-02-20 14:42+0100\n" "PO-Revision-Date: 2012-08-08 07:58+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -685,11 +685,17 @@ msgstr "説明" #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:41 +#, fuzzy +#| msgid "" +#| "<command>apt-get</command> is the command-line tool for handling " +#| "packages, and may be considered the user's \"back-end\" to other tools " +#| "using the APT library. Several \"front-end\" interfaces exist, such as " +#| "&dselect;, &aptitude;, &synaptic; and &wajig;." msgid "" "<command>apt-get</command> is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " -"library. Several \"front-end\" interfaces exist, such as &dselect;, " -"&aptitude;, &synaptic; and &wajig;." +"library. Several \"front-end\" interfaces exist, such as &aptitude;, " +"&synaptic; and &wajig;." msgstr "" "<command>apt-get</command> は、パッケージを操作するコマンドラインツールで、" "APT ライブラリを用いる他のツールのユーザ側「バックエンド」といえるものです。" @@ -1025,14 +1031,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:217 +#, fuzzy +#| msgid "" +#| "<literal>clean</literal> clears out the local repository of retrieved " +#| "package files. It removes everything but the lock file from " +#| "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/" +#| "archives/partial/</filename>. When APT is used as a &dselect; method, " +#| "<literal>clean</literal> is run automatically. Those who do not use " +#| "dselect will likely want to run <literal>apt-get clean</literal> from " +#| "time to time to free up disk space." msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/archives/" -"partial/</filename>. When APT is used as a &dselect; method, <literal>clean</" -"literal> is run automatically. Those who do not use dselect will likely " -"want to run <literal>apt-get clean</literal> from time to time to free up " -"disk space." +"partial/</filename>." msgstr "" "<literal>clean</literal> は、取得したパッケージのローカルリポジトリを掃除しま" "す。<filename>&cachedir;/archives/</filename> と <filename>&cachedir;/" @@ -1042,7 +1054,7 @@ msgstr "" "<literal>apt-get clean</literal> を実行したくなるでしょう。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:227 +#: apt-get.8.xml:224 msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -1061,7 +1073,7 @@ msgstr "" "防げます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:237 +#: apt-get.8.xml:234 msgid "" "<literal>autoremove</literal> is used to remove packages that were " "automatically installed to satisfy dependencies for other packages and are " @@ -1071,7 +1083,7 @@ msgstr "" "的にインストールされ、もう必要なくなったパッケージを削除するのに使用します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:242 +#: apt-get.8.xml:239 msgid "" "<literal>changelog</literal> downloads a package changelog and displays it " "through <command>sensible-pager</command>. The server name and base " @@ -1093,14 +1105,14 @@ msgstr "" "option> コマンドと同じオプションを使用できます。" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:260 apt-cache.8.xml:250 apt-mark.8.xml:110 +#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110 #: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50 #: apt-ftparchive.1.xml:506 msgid "options" msgstr "オプション" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:265 +#: apt-get.8.xml:262 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." @@ -1109,7 +1121,7 @@ msgstr "" "<literal>APT::Install-Recommends</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:270 +#: apt-get.8.xml:267 msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." @@ -1118,7 +1130,7 @@ msgstr "" "<literal>APT::Install-Suggests</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:275 +#: apt-get.8.xml:272 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." @@ -1127,7 +1139,20 @@ msgstr "" "いません。設定項目: <literal>APT::Get::Download-Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:280 +#: apt-get.8.xml:277 +#, fuzzy +#| msgid "" +#| "Fix; attempt to correct a system with broken dependencies in place. This " +#| "option, when used with install/remove, can omit any packages to permit " +#| "APT to deduce a likely solution. If packages are specified, these have to " +#| "completely correct the problem. The option is sometimes necessary when " +#| "running APT for the first time; APT itself does not allow broken package " +#| "dependencies to exist on a system. It is possible that a system's " +#| "dependency structure can be so corrupt as to require manual intervention " +#| "(which usually means using &dselect; or <command>dpkg --remove</command> " +#| "to eliminate some of the offending packages). Use of this option together " +#| "with <option>-m</option> may produce an error in some situations. " +#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>." msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -1136,10 +1161,10 @@ msgid "" "running APT for the first time; APT itself does not allow broken package " "dependencies to exist on a system. It is possible that a system's dependency " "structure can be so corrupt as to require manual intervention (which usually " -"means using &dselect; or <command>dpkg --remove</command> to eliminate some " -"of the offending packages). Use of this option together with <option>-m</" -"option> may produce an error in some situations. Configuration Item: " -"<literal>APT::Get::Fix-Broken</literal>." +"means using <command>dpkg --remove</command> to eliminate some of the " +"offending packages). Use of this option together with <option>-m</option> " +"may produce an error in some situations. Configuration Item: <literal>APT::" +"Get::Fix-Broken</literal>." msgstr "" "修復 - 依存関係が壊れたシステムの修正を試みます。このオプションを install や " "remove と一緒に使うときは、APT が解決法を推測するので、パッケージを指定しなく" @@ -1153,7 +1178,7 @@ msgstr "" "<literal>APT::Get::Fix-Broken</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:295 +#: apt-get.8.xml:292 msgid "" "Ignore missing packages; if packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -1172,7 +1197,7 @@ msgstr "" "Get::Fix-Missing</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:306 +#: apt-get.8.xml:303 msgid "" "Disables downloading of packages. This is best used with <option>--ignore-" "missing</option> to force APT to use only the .debs it has already " @@ -1183,7 +1208,7 @@ msgstr "" "がよいでしょう。設定項目: <literal>APT::Get::Download</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:310 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -1202,7 +1227,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:328 +#: apt-get.8.xml:325 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: <literal>APT::Get::" @@ -1212,7 +1237,7 @@ msgstr "" "行いません。設定項目: <literal>APT::Get::Simulate</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:332 +#: apt-get.8.xml:329 msgid "" "Simulated runs performed as a user will automatically deactivate locking " "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::" @@ -1230,7 +1255,7 @@ msgstr "" "による警告などなくても、何をしているのか知っていなければなりません)。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:340 +#: apt-get.8.xml:337 msgid "" "Simulated runs print out a series of lines, each representing a " "<command>dpkg</command> operation: configure (<literal>Conf</literal>), " @@ -1244,7 +1269,7 @@ msgstr "" "れに) 空の角カッコは大した問題ではないことを表します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:348 +#: apt-get.8.xml:345 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -1258,7 +1283,7 @@ msgstr "" "定項目: <literal>APT::Get::Assume-Yes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:356 +#: apt-get.8.xml:353 msgid "" "Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::" "Assume-No</literal>." @@ -1267,7 +1292,7 @@ msgstr "" "Assume-No</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:361 +#: apt-get.8.xml:358 msgid "" "Show upgraded packages; print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." @@ -1276,7 +1301,7 @@ msgstr "" "<literal>APT::Get::Show-Upgraded</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:367 +#: apt-get.8.xml:364 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." @@ -1285,7 +1310,7 @@ msgstr "" "<literal>APT::Get::Show-Versions</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:373 +#: apt-get.8.xml:370 msgid "" "This option controls the architecture packages are built for by <command>apt-" "get source --compile</command> and how cross-builddependencies are " @@ -1301,7 +1326,7 @@ msgstr "" "ます。設定項目: <literal>APT::Get::Host-Architecture</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:383 +#: apt-get.8.xml:380 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -1310,7 +1335,7 @@ msgstr "" "Get::Compile</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:388 +#: apt-get.8.xml:385 msgid "" "Ignore package holds; this causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -1323,7 +1348,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:395 +#: apt-get.8.xml:392 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -1335,7 +1360,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:404 msgid "" "Do not upgrade packages; when used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -1348,7 +1373,7 @@ msgstr "" "Upgrade</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:414 +#: apt-get.8.xml:411 msgid "" "Do not install new packages; when used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will install upgrades for already " @@ -1361,7 +1386,7 @@ msgstr "" "定項目: <literal>APT::Get::Only-Upgrade</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:422 +#: apt-get.8.xml:419 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 " @@ -1375,7 +1400,7 @@ msgstr "" "ん! 設定項目: <literal>APT::Get::force-yes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:430 +#: apt-get.8.xml:427 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected MD5 " @@ -1396,7 +1421,7 @@ msgstr "" "Print-URIs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:441 +#: apt-get.8.xml:438 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -1409,7 +1434,7 @@ msgstr "" "<literal>APT::Get::Purge</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:449 +#: apt-get.8.xml:446 msgid "" "Re-install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -1418,7 +1443,7 @@ msgstr "" "定項目: <literal>APT::Get::ReInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:454 +#: apt-get.8.xml:451 msgid "" "This option is on by default; use <literal>--no-list-cleanup</literal> to " "turn it off. When it is on, <command>apt-get</command> will automatically " @@ -1434,7 +1459,7 @@ msgstr "" "する時ぐらいでしょう。設定項目: <literal>APT::Get::List-Cleanup</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:461 msgid "" "This option controls the default input to the policy engine; it creates a " "default pin at priority 990 using the specified release string. This " @@ -1457,7 +1482,7 @@ msgstr "" "さい。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:479 +#: apt-get.8.xml:476 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where <option>--assume-yes</" @@ -1470,7 +1495,7 @@ msgstr "" "目: <literal>APT::Get::Trivial-Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:486 +#: apt-get.8.xml:483 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -1479,7 +1504,7 @@ msgstr "" "項目: <literal>APT::Get::Remove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:492 +#: apt-get.8.xml:489 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running the <literal>autoremove</" @@ -1492,7 +1517,7 @@ msgstr "" "<literal>APT::Get::AutomaticRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:499 +#: apt-get.8.xml:496 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -1510,7 +1535,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:510 +#: apt-get.8.xml:507 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -1521,7 +1546,7 @@ msgstr "" "<literal>APT::Get::Dsc-Only</literal>, <literal>APT::Get::Tar-Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:516 +#: apt-get.8.xml:513 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -1530,7 +1555,7 @@ msgstr "" "<literal>APT::Get::Arch-Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:521 +#: apt-get.8.xml:518 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -1541,7 +1566,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:527 +#: apt-get.8.xml:524 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1551,13 +1576,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:540 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 +#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 #: apt.conf.5.xml:1200 apt_preferences.5.xml:700 msgid "Files" msgstr "ファイル" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 +#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 #: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 #: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 @@ -1566,25 +1591,30 @@ msgid "See Also" msgstr "関連項目" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:551 +#: apt-get.8.xml:548 +#, fuzzy +#| msgid "" +#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" +#| "preferences;, the APT Howto." msgid "" -"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " -"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" -"preferences;, the APT Howto." +"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, " +"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the " +"APT Howto." msgstr "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, &guidesdir; にある APT ユーザガイド, &apt-" "preferences;, APT Howto" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:556 apt-cache.8.xml:357 apt-mark.8.xml:137 +#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 #: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76 #: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613 msgid "Diagnostics" msgstr "診断メッセージ" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:557 +#: apt-get.8.xml:554 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." diff --git a/doc/po/pl.po b/doc/po/pl.po index 99c07d3ff..5b6463102 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 09:53+0100\n" +"POT-Creation-Date: 2014-02-20 14:42+0100\n" "PO-Revision-Date: 2012-07-28 21:59+0200\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n" @@ -686,11 +686,17 @@ msgstr "Opis" #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:41 +#, fuzzy +#| msgid "" +#| "<command>apt-get</command> is the command-line tool for handling " +#| "packages, and may be considered the user's \"back-end\" to other tools " +#| "using the APT library. Several \"front-end\" interfaces exist, such as " +#| "&dselect;, &aptitude;, &synaptic; and &wajig;." msgid "" "<command>apt-get</command> is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " -"library. Several \"front-end\" interfaces exist, such as &dselect;, " -"&aptitude;, &synaptic; and &wajig;." +"library. Several \"front-end\" interfaces exist, such as &aptitude;, " +"&synaptic; and &wajig;." msgstr "" "<command>apt-get</command> jest narzędziem do zarządzania pakietami " "działającym z linii poleceń, które może być uznane za wewnętrzne narzędzie " @@ -1056,14 +1062,20 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:217 +#, fuzzy +#| msgid "" +#| "<literal>clean</literal> clears out the local repository of retrieved " +#| "package files. It removes everything but the lock file from " +#| "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/" +#| "archives/partial/</filename>. When APT is used as a &dselect; method, " +#| "<literal>clean</literal> is run automatically. Those who do not use " +#| "dselect will likely want to run <literal>apt-get clean</literal> from " +#| "time to time to free up disk space." msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/archives/" -"partial/</filename>. When APT is used as a &dselect; method, <literal>clean</" -"literal> is run automatically. Those who do not use dselect will likely " -"want to run <literal>apt-get clean</literal> from time to time to free up " -"disk space." +"partial/</filename>." msgstr "" "<literal>clean</literal> czyści lokalne repozytorium ściągniętych plików z " "pakietami. Usuwa wszystko z wyjątkiem pliku blokady <filename>&cachedir;/" @@ -1075,7 +1087,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:227 +#: apt-get.8.xml:224 msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -1095,7 +1107,7 @@ msgstr "" "zawierających zainstalowane pakiety." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:237 +#: apt-get.8.xml:234 msgid "" "<literal>autoremove</literal> is used to remove packages that were " "automatically installed to satisfy dependencies for other packages and are " @@ -1106,7 +1118,7 @@ msgstr "" "pakietach, i nie są już potrzebne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:242 +#: apt-get.8.xml:239 msgid "" "<literal>changelog</literal> downloads a package changelog and displays it " "through <command>sensible-pager</command>. The server name and base " @@ -1129,14 +1141,14 @@ msgstr "" "te dla polecenia <option>install</option>." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:260 apt-cache.8.xml:250 apt-mark.8.xml:110 +#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110 #: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50 #: apt-ftparchive.1.xml:506 msgid "options" msgstr "opcje" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:265 +#: apt-get.8.xml:262 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." @@ -1145,7 +1157,7 @@ msgstr "" "Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:270 +#: apt-get.8.xml:267 msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." @@ -1155,7 +1167,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:275 +#: apt-get.8.xml:272 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." @@ -1166,7 +1178,20 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:280 +#: apt-get.8.xml:277 +#, fuzzy +#| msgid "" +#| "Fix; attempt to correct a system with broken dependencies in place. This " +#| "option, when used with install/remove, can omit any packages to permit " +#| "APT to deduce a likely solution. If packages are specified, these have to " +#| "completely correct the problem. The option is sometimes necessary when " +#| "running APT for the first time; APT itself does not allow broken package " +#| "dependencies to exist on a system. It is possible that a system's " +#| "dependency structure can be so corrupt as to require manual intervention " +#| "(which usually means using &dselect; or <command>dpkg --remove</command> " +#| "to eliminate some of the offending packages). Use of this option together " +#| "with <option>-m</option> may produce an error in some situations. " +#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>." msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -1175,10 +1200,10 @@ msgid "" "running APT for the first time; APT itself does not allow broken package " "dependencies to exist on a system. It is possible that a system's dependency " "structure can be so corrupt as to require manual intervention (which usually " -"means using &dselect; or <command>dpkg --remove</command> to eliminate some " -"of the offending packages). Use of this option together with <option>-m</" -"option> may produce an error in some situations. Configuration Item: " -"<literal>APT::Get::Fix-Broken</literal>." +"means using <command>dpkg --remove</command> to eliminate some of the " +"offending packages). Use of this option together with <option>-m</option> " +"may produce an error in some situations. Configuration Item: <literal>APT::" +"Get::Fix-Broken</literal>." msgstr "" "Popraw; podejmuje próbę poprawienia zepsutych zależności. Używanie tej opcji " "z install/remove może spowodować pominięcie któregokolwiek z pakietów " @@ -1194,7 +1219,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:295 +#: apt-get.8.xml:292 msgid "" "Ignore missing packages; if packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -1214,7 +1239,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:306 +#: apt-get.8.xml:303 msgid "" "Disables downloading of packages. This is best used with <option>--ignore-" "missing</option> to force APT to use only the .debs it has already " @@ -1226,7 +1251,7 @@ msgstr "" "Download</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:310 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -1247,7 +1272,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:328 +#: apt-get.8.xml:325 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: <literal>APT::Get::" @@ -1258,7 +1283,7 @@ msgstr "" "Get::Simulate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:332 +#: apt-get.8.xml:329 msgid "" "Simulated runs performed as a user will automatically deactivate locking " "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::" @@ -1278,7 +1303,7 @@ msgstr "" "strony <literal>apt-get</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:340 +#: apt-get.8.xml:337 msgid "" "Simulated runs print out a series of lines, each representing a " "<command>dpkg</command> operation: configure (<literal>Conf</literal>), " @@ -1295,7 +1320,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:348 +#: apt-get.8.xml:345 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -1311,7 +1336,7 @@ msgstr "" "Assume-Yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:356 +#: apt-get.8.xml:353 msgid "" "Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::" "Assume-No</literal>." @@ -1321,7 +1346,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:361 +#: apt-get.8.xml:358 msgid "" "Show upgraded packages; print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." @@ -1332,7 +1357,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:367 +#: apt-get.8.xml:364 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." @@ -1341,7 +1366,7 @@ msgstr "" "konfiguracyjnym: <literal>APT::Get::Show-Versions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:373 +#: apt-get.8.xml:370 msgid "" "This option controls the architecture packages are built for by <command>apt-" "get source --compile</command> and how cross-builddependencies are " @@ -1360,7 +1385,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:383 +#: apt-get.8.xml:380 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -1370,7 +1395,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:388 +#: apt-get.8.xml:385 msgid "" "Ignore package holds; this causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -1384,7 +1409,7 @@ msgstr "" "<literal>APT::Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:395 +#: apt-get.8.xml:392 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -1397,7 +1422,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:404 msgid "" "Do not upgrade packages; when used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -1410,7 +1435,7 @@ msgstr "" "<literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:414 +#: apt-get.8.xml:411 msgid "" "Do not install new packages; when used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will install upgrades for already " @@ -1424,7 +1449,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:422 +#: apt-get.8.xml:419 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 " @@ -1441,7 +1466,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:430 +#: apt-get.8.xml:427 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected MD5 " @@ -1464,7 +1489,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:441 +#: apt-get.8.xml:438 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -1479,7 +1504,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:449 +#: apt-get.8.xml:446 msgid "" "Re-install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -1488,7 +1513,7 @@ msgstr "" "Pozycja w pliku konfiguracyjnym: <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:454 +#: apt-get.8.xml:451 msgid "" "This option is on by default; use <literal>--no-list-cleanup</literal> to " "turn it off. When it is on, <command>apt-get</command> will automatically " @@ -1506,7 +1531,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:461 msgid "" "This option controls the default input to the policy engine; it creates a " "default pin at priority 990 using the specified release string. This " @@ -1530,7 +1555,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:479 +#: apt-get.8.xml:476 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where <option>--assume-yes</" @@ -1545,7 +1570,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:486 +#: apt-get.8.xml:483 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -1555,7 +1580,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:492 +#: apt-get.8.xml:489 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running the <literal>autoremove</" @@ -1570,7 +1595,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:499 +#: apt-get.8.xml:496 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -1590,7 +1615,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:510 +#: apt-get.8.xml:507 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -1602,7 +1627,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:516 +#: apt-get.8.xml:513 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -1613,7 +1638,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:521 +#: apt-get.8.xml:518 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -1624,7 +1649,7 @@ msgstr "" "w pliku konfiguracyjnym: <literal>APT::Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:527 +#: apt-get.8.xml:524 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1634,13 +1659,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:540 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 +#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 #: apt.conf.5.xml:1200 apt_preferences.5.xml:700 msgid "Files" msgstr "Pliki" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 +#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 #: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 #: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 @@ -1650,18 +1675,23 @@ msgstr "Zobacz także" # #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:551 +#: apt-get.8.xml:548 +#, fuzzy +#| msgid "" +#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" +#| "preferences;, the APT Howto." msgid "" -"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " -"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" -"preferences;, the APT Howto." +"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, " +"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the " +"APT Howto." msgstr "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, Przewodnik APT dla użytkowników w &guidesdir;, " "&apt-preferences;, APT Howto." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:556 apt-cache.8.xml:357 apt-mark.8.xml:137 +#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 #: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76 #: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613 msgid "Diagnostics" @@ -1669,7 +1699,7 @@ msgstr "Diagnostyka" # #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:557 +#: apt-get.8.xml:554 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." diff --git a/doc/po/pt.po b/doc/po/pt.po index 3092cd08d..c4668f2ee 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 09:53+0100\n" +"POT-Creation-Date: 2014-02-20 14:42+0100\n" "PO-Revision-Date: 2012-09-03 01:53+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n" "Language-Team: Portuguese <l10n@debianpt.org>\n" @@ -690,11 +690,17 @@ msgstr "Descrição" #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:41 +#, fuzzy +#| msgid "" +#| "<command>apt-get</command> is the command-line tool for handling " +#| "packages, and may be considered the user's \"back-end\" to other tools " +#| "using the APT library. Several \"front-end\" interfaces exist, such as " +#| "&dselect;, &aptitude;, &synaptic; and &wajig;." msgid "" "<command>apt-get</command> is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " -"library. Several \"front-end\" interfaces exist, such as &dselect;, " -"&aptitude;, &synaptic; and &wajig;." +"library. Several \"front-end\" interfaces exist, such as &aptitude;, " +"&synaptic; and &wajig;." msgstr "" "<command>apt-get</command> é a ferramenta de linha de comandos para lidar " "com pacotes, e pode ser considerada o \"back-end\" dos utilizadores para " @@ -1042,14 +1048,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:217 +#, fuzzy +#| msgid "" +#| "<literal>clean</literal> clears out the local repository of retrieved " +#| "package files. It removes everything but the lock file from " +#| "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/" +#| "archives/partial/</filename>. When APT is used as a &dselect; method, " +#| "<literal>clean</literal> is run automatically. Those who do not use " +#| "dselect will likely want to run <literal>apt-get clean</literal> from " +#| "time to time to free up disk space." msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/archives/" -"partial/</filename>. When APT is used as a &dselect; method, <literal>clean</" -"literal> is run automatically. Those who do not use dselect will likely " -"want to run <literal>apt-get clean</literal> from time to time to free up " -"disk space." +"partial/</filename>." msgstr "" "<literal>clean</literal> limpa o repositório local dos ficheiros de pacotes " "obtidos. Remove tudo excepto o ficheiro lock de <filename>&cachedir;/" @@ -1060,7 +1072,7 @@ msgstr "" "libertar espaço do disco." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:227 +#: apt-get.8.xml:224 msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -1079,7 +1091,7 @@ msgstr "" "pacotes instalados sejam apagados se estiver definida para 'off'." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:237 +#: apt-get.8.xml:234 msgid "" "<literal>autoremove</literal> is used to remove packages that were " "automatically installed to satisfy dependencies for other packages and are " @@ -1090,7 +1102,7 @@ msgstr "" "que já não são necessários." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:242 +#: apt-get.8.xml:239 msgid "" "<literal>changelog</literal> downloads a package changelog and displays it " "through <command>sensible-pager</command>. The server name and base " @@ -1113,14 +1125,14 @@ msgstr "" "para o comando <option>install</option>." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:260 apt-cache.8.xml:250 apt-mark.8.xml:110 +#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110 #: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50 #: apt-ftparchive.1.xml:506 msgid "options" msgstr "opções" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:265 +#: apt-get.8.xml:262 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." @@ -1129,7 +1141,7 @@ msgstr "" "de Configuração: <literal>APT::Install-Recommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:270 +#: apt-get.8.xml:267 msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." @@ -1138,7 +1150,7 @@ msgstr "" "Configuração: <literal>APT::Install-Suggests</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:275 +#: apt-get.8.xml:272 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." @@ -1148,7 +1160,20 @@ msgstr "" "Download-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:280 +#: apt-get.8.xml:277 +#, fuzzy +#| msgid "" +#| "Fix; attempt to correct a system with broken dependencies in place. This " +#| "option, when used with install/remove, can omit any packages to permit " +#| "APT to deduce a likely solution. If packages are specified, these have to " +#| "completely correct the problem. The option is sometimes necessary when " +#| "running APT for the first time; APT itself does not allow broken package " +#| "dependencies to exist on a system. It is possible that a system's " +#| "dependency structure can be so corrupt as to require manual intervention " +#| "(which usually means using &dselect; or <command>dpkg --remove</command> " +#| "to eliminate some of the offending packages). Use of this option together " +#| "with <option>-m</option> may produce an error in some situations. " +#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>." msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -1157,10 +1182,10 @@ msgid "" "running APT for the first time; APT itself does not allow broken package " "dependencies to exist on a system. It is possible that a system's dependency " "structure can be so corrupt as to require manual intervention (which usually " -"means using &dselect; or <command>dpkg --remove</command> to eliminate some " -"of the offending packages). Use of this option together with <option>-m</" -"option> may produce an error in some situations. Configuration Item: " -"<literal>APT::Get::Fix-Broken</literal>." +"means using <command>dpkg --remove</command> to eliminate some of the " +"offending packages). Use of this option together with <option>-m</option> " +"may produce an error in some situations. Configuration Item: <literal>APT::" +"Get::Fix-Broken</literal>." msgstr "" "Corrige; tenta corrigir um sistema com dependências quebradas no lugar. Esta " "opção, quando usada com install/remove, pode omitir quaisquer pacotes para " @@ -1176,7 +1201,7 @@ msgstr "" "<literal>APT::Get::Fix-Broken</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:295 +#: apt-get.8.xml:292 msgid "" "Ignore missing packages; if packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -1195,7 +1220,7 @@ msgstr "" "de Configuração: <literal>APT::Get::Fix-Missing</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:306 +#: apt-get.8.xml:303 msgid "" "Disables downloading of packages. This is best used with <option>--ignore-" "missing</option> to force APT to use only the .debs it has already " @@ -1206,7 +1231,7 @@ msgstr "" "descarregados. Item de Configuração: <literal>APT::Get::Download</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:310 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -1226,7 +1251,7 @@ msgstr "" "<literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:328 +#: apt-get.8.xml:325 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: <literal>APT::Get::" @@ -1237,7 +1262,7 @@ msgstr "" "Simulate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:332 +#: apt-get.8.xml:329 msgid "" "Simulated runs performed as a user will automatically deactivate locking " "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::" @@ -1256,7 +1281,7 @@ msgstr "" "avisos do <literal>apt-get</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:340 +#: apt-get.8.xml:337 msgid "" "Simulated runs print out a series of lines, each representing a " "<command>dpkg</command> operation: configure (<literal>Conf</literal>), " @@ -1271,7 +1296,7 @@ msgstr "" "indicam quebras que não têm consequência (raro)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:348 +#: apt-get.8.xml:345 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -1287,7 +1312,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:356 +#: apt-get.8.xml:353 msgid "" "Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::" "Assume-No</literal>." @@ -1296,7 +1321,7 @@ msgstr "" "<literal>APT::Get::Assume-No</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:361 +#: apt-get.8.xml:358 msgid "" "Show upgraded packages; print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." @@ -1306,7 +1331,7 @@ msgstr "" "Upgraded</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:367 +#: apt-get.8.xml:364 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." @@ -1315,7 +1340,7 @@ msgstr "" "Configuração: <literal>APT::Get::Show-Versions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:373 +#: apt-get.8.xml:370 msgid "" "This option controls the architecture packages are built for by <command>apt-" "get source --compile</command> and how cross-builddependencies are " @@ -1332,7 +1357,7 @@ msgstr "" "item de Configuração: <literal>APT::Get::Host-Architecture</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:383 +#: apt-get.8.xml:380 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -1341,7 +1366,7 @@ msgstr "" "<literal>APT::Get::Compile</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:388 +#: apt-get.8.xml:385 msgid "" "Ignore package holds; this causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -1354,7 +1379,7 @@ msgstr "" "Item de Configuração: <literal>APT::Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:395 +#: apt-get.8.xml:392 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -1366,7 +1391,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:404 msgid "" "Do not upgrade packages; when used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -1379,7 +1404,7 @@ msgstr "" "Configuração: <literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:414 +#: apt-get.8.xml:411 msgid "" "Do not install new packages; when used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will install upgrades for already " @@ -1392,7 +1417,7 @@ msgstr "" "Item de Configuração: <literal>APT::Get::Only-Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:422 +#: apt-get.8.xml:419 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 " @@ -1407,7 +1432,7 @@ msgstr "" "<literal>APT::Get::force-yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:430 +#: apt-get.8.xml:427 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected MD5 " @@ -1428,7 +1453,7 @@ msgstr "" "Configuração: <literal>APT::Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:441 +#: apt-get.8.xml:438 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -1441,7 +1466,7 @@ msgstr "" "option>. Item de Configuração: <literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:449 +#: apt-get.8.xml:446 msgid "" "Re-install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -1450,7 +1475,7 @@ msgstr "" "Configuração: <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:454 +#: apt-get.8.xml:451 msgid "" "This option is on by default; use <literal>--no-list-cleanup</literal> to " "turn it off. When it is on, <command>apt-get</command> will automatically " @@ -1467,7 +1492,7 @@ msgstr "" "fontes. Item de Configuração: <literal>APT::Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:461 msgid "" "This option controls the default input to the policy engine; it creates a " "default pin at priority 990 using the specified release string. This " @@ -1490,7 +1515,7 @@ msgstr "" "Release</literal>; veja também o manual &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:479 +#: apt-get.8.xml:476 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where <option>--assume-yes</" @@ -1504,7 +1529,7 @@ msgstr "" "Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:486 +#: apt-get.8.xml:483 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -1514,7 +1539,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:492 +#: apt-get.8.xml:489 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running the <literal>autoremove</" @@ -1527,7 +1552,7 @@ msgstr "" "Configuração: <literal>APT::Get::AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:499 +#: apt-get.8.xml:496 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -1546,7 +1571,7 @@ msgstr "" "<literal>APT::Get::Only-Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:510 +#: apt-get.8.xml:507 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -1557,7 +1582,7 @@ msgstr "" "Only</literal>, e <literal>APT::Get::Tar-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:516 +#: apt-get.8.xml:513 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -1566,7 +1591,7 @@ msgstr "" "de Configuração: <literal>APT::Get::Arch-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:521 +#: apt-get.8.xml:518 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -1577,7 +1602,7 @@ msgstr "" "Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:527 +#: apt-get.8.xml:524 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1587,13 +1612,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:540 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 +#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 #: apt.conf.5.xml:1200 apt_preferences.5.xml:700 msgid "Files" msgstr "Ficheiros" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 +#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 #: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 #: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 @@ -1602,25 +1627,30 @@ msgid "See Also" msgstr "Veja também" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:551 +#: apt-get.8.xml:548 +#, fuzzy +#| msgid "" +#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" +#| "preferences;, the APT Howto." msgid "" -"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " -"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" -"preferences;, the APT Howto." +"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, " +"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the " +"APT Howto." msgstr "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, O guia de utilizadores do The APT em " "&guidesdir;, &apt-preferences;, o Howto do APT." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:556 apt-cache.8.xml:357 apt-mark.8.xml:137 +#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 #: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76 #: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613 msgid "Diagnostics" msgstr "Diagnóstico" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:557 +#: apt-get.8.xml:554 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 8bc4e768d..1e75023f1 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -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: 2014-02-13 09:53+0100\n" +"POT-Creation-Date: 2014-02-20 14:42+0100\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" @@ -512,8 +512,8 @@ msgstr "Descrição" msgid "" "<command>apt-get</command> is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " -"library. Several \"front-end\" interfaces exist, such as &dselect;, " -"&aptitude;, &synaptic; and &wajig;." +"library. Several \"front-end\" interfaces exist, such as &aptitude;, " +"&synaptic; and &wajig;." msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -743,14 +743,11 @@ msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/archives/" -"partial/</filename>. When APT is used as a &dselect; method, <literal>clean</" -"literal> is run automatically. Those who do not use dselect will likely " -"want to run <literal>apt-get clean</literal> from time to time to free up " -"disk space." +"partial/</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:227 +#: apt-get.8.xml:224 msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -762,7 +759,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:237 +#: apt-get.8.xml:234 msgid "" "<literal>autoremove</literal> is used to remove packages that were " "automatically installed to satisfy dependencies for other packages and are " @@ -770,7 +767,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:242 +#: apt-get.8.xml:239 msgid "" "<literal>changelog</literal> downloads a package changelog and displays it " "through <command>sensible-pager</command>. The server name and base " @@ -784,35 +781,35 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:260 apt-cache.8.xml:250 apt-mark.8.xml:110 +#: apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110 #: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50 #: apt-ftparchive.1.xml:506 msgid "options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:265 +#: apt-get.8.xml:262 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:270 +#: apt-get.8.xml:267 msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:275 +#: apt-get.8.xml:272 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:280 +#: apt-get.8.xml:277 msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -821,14 +818,14 @@ msgid "" "running APT for the first time; APT itself does not allow broken package " "dependencies to exist on a system. It is possible that a system's dependency " "structure can be so corrupt as to require manual intervention (which usually " -"means using &dselect; or <command>dpkg --remove</command> to eliminate some " -"of the offending packages). Use of this option together with <option>-m</" -"option> may produce an error in some situations. Configuration Item: " -"<literal>APT::Get::Fix-Broken</literal>." +"means using <command>dpkg --remove</command> to eliminate some of the " +"offending packages). Use of this option together with <option>-m</option> " +"may produce an error in some situations. Configuration Item: <literal>APT::" +"Get::Fix-Broken</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:295 +#: apt-get.8.xml:292 msgid "" "Ignore missing packages; if packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -840,7 +837,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:306 +#: apt-get.8.xml:303 msgid "" "Disables downloading of packages. This is best used with <option>--ignore-" "missing</option> to force APT to use only the .debs it has already " @@ -848,7 +845,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:310 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -860,7 +857,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:328 +#: apt-get.8.xml:325 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: <literal>APT::Get::" @@ -868,7 +865,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:332 +#: apt-get.8.xml:329 msgid "" "Simulated runs performed as a user will automatically deactivate locking " "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::" @@ -880,7 +877,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:340 +#: apt-get.8.xml:337 msgid "" "Simulated runs print out a series of lines, each representing a " "<command>dpkg</command> operation: configure (<literal>Conf</literal>), " @@ -890,7 +887,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:348 +#: apt-get.8.xml:345 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -900,28 +897,28 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:356 +#: apt-get.8.xml:353 msgid "" "Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::" "Assume-No</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:361 +#: apt-get.8.xml:358 msgid "" "Show upgraded packages; print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:367 +#: apt-get.8.xml:364 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:373 +#: apt-get.8.xml:370 msgid "" "This option controls the architecture packages are built for by <command>apt-" "get source --compile</command> and how cross-builddependencies are " @@ -932,14 +929,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:383 +#: apt-get.8.xml:380 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:388 +#: apt-get.8.xml:385 msgid "" "Ignore package holds; this causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -948,7 +945,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:395 +#: apt-get.8.xml:392 msgid "" "Allow installing new packages when used in conjunction with " "<literal>upgrade</literal>. This is useful if the update of a installed " @@ -960,7 +957,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:407 +#: apt-get.8.xml:404 msgid "" "Do not upgrade packages; when used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -969,7 +966,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:414 +#: apt-get.8.xml:411 msgid "" "Do not install new packages; when used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will install upgrades for already " @@ -978,7 +975,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:422 +#: apt-get.8.xml:419 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 " @@ -988,7 +985,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:430 +#: apt-get.8.xml:427 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected MD5 " @@ -1001,7 +998,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:441 +#: apt-get.8.xml:438 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -1010,14 +1007,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:449 +#: apt-get.8.xml:446 msgid "" "Re-install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:454 +#: apt-get.8.xml:451 msgid "" "This option is on by default; use <literal>--no-list-cleanup</literal> to " "turn it off. When it is on, <command>apt-get</command> will automatically " @@ -1028,7 +1025,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:461 msgid "" "This option controls the default input to the policy engine; it creates a " "default pin at priority 990 using the specified release string. This " @@ -1042,7 +1039,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:479 +#: apt-get.8.xml:476 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>; where <option>--assume-yes</" @@ -1051,14 +1048,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:486 +#: apt-get.8.xml:483 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:492 +#: apt-get.8.xml:489 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running the <literal>autoremove</" @@ -1067,7 +1064,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:499 +#: apt-get.8.xml:496 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -1079,7 +1076,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:510 +#: apt-get.8.xml:507 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -1087,14 +1084,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:516 +#: apt-get.8.xml:513 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:521 +#: apt-get.8.xml:518 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -1102,7 +1099,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:527 +#: apt-get.8.xml:524 msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1112,13 +1109,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:540 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 +#: apt-get.8.xml:537 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 #: apt.conf.5.xml:1200 apt_preferences.5.xml:700 msgid "Files" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 +#: apt-get.8.xml:547 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 #: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 #: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:280 #: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 @@ -1128,22 +1125,22 @@ msgid "See Also" msgstr "Consulte também" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:551 +#: apt-get.8.xml:548 msgid "" -"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " -"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" -"preferences;, the APT Howto." +"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, " +"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the " +"APT Howto." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:556 apt-cache.8.xml:357 apt-mark.8.xml:137 +#: apt-get.8.xml:553 apt-cache.8.xml:357 apt-mark.8.xml:137 #: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76 #: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613 msgid "Diagnostics" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:557 +#: apt-get.8.xml:554 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." diff --git a/po/ar.po b/po/ar.po index 12f2a2a4e..e1691f84d 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -117,7 +117,7 @@ msgstr "يجب أن تعطي صيغة واحدة بالضبط" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "تعذر العثور على الحزمة %s" @@ -608,7 +608,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -783,7 +784,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "تعذر قبول الاتصال" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "" @@ -967,15 +968,15 @@ msgstr "خادم http له دعم مدى معطوب" msgid "Unknown date format" msgstr "نسق تاريخ مجهول" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "بيانات ترويسة سيئة" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "فشل الاتصال" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "خطأ داخلي" @@ -1460,33 +1461,33 @@ msgstr "فشل تغيير اسم %s إلى %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "" -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "جلب:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "تجاهل" -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "خطأ" -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "جلب %sب في %s (%sب/ث)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [يعمل]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2380,22 +2381,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "مشكلة في مزامنة الملف" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "مشكلة في مزامنة الملف" @@ -2671,17 +2672,22 @@ msgstr "" msgid "Retrieving file %li of %li" msgstr "" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, c-format +msgid "Is the package %s installed?" +msgstr "" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال." @@ -3011,49 +3017,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "تعذر العثور على الحزمة %s" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "تعذر العثور على الحزمة %s" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "تعذر العثور على الحزمة %s" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/ast.po b/po/ast.po index 617e576c9..716e1b0d9 100644 --- a/po/ast.po +++ b/po/ast.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -109,7 +109,7 @@ msgstr "Has de dar polo menos un patrón de gueta" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Nun pue alcontrase'l paquete %s" @@ -714,7 +714,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -889,7 +890,7 @@ msgstr "Gandió'l tiempu de conexón col zócalu de datos" msgid "Unable to accept connection" msgstr "Nun se pudo aceptar la conexón" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Hebo un problema al xenerar el hash del ficheru" @@ -1076,15 +1077,15 @@ msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance" msgid "Unknown date format" msgstr "Formatu de data desconocíu" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Datos de testera incorreutos" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Fallo la conexón" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Fallu internu" @@ -1587,33 +1588,33 @@ msgstr "Nun pudo renomase %s como %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Oxe " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Des:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Descargaos %sB en %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Tresnando]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2590,22 +2591,22 @@ msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada" msgid "write, still have %llu to write but couldn't" msgstr "escritos, entá tenía d'escribir %lu pero nun pudo facerse" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Problemes zarrando'l ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Hai problemes al renomar el ficheru %s a %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Hai problemes desvenceyando'l ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Hai problemes al sincronizar el ficheru" @@ -2892,17 +2893,22 @@ msgstr "Descargando ficheru %li de %li (falten %s)" msgid "Retrieving file %li of %li" msgstr "Descargando ficheru %li de %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Nun pudo alncontrase'l controlador de métodu %s." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "El métodu %s nun entamó correchamente" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Por favor, introduz el discu '%s' nel preséu '%s' y calca Intro." @@ -3245,33 +3251,38 @@ msgstr "Nun puede alcontrase'l rexistru d'autenticación pa: %s" msgid "Hash mismatch for: %s" msgstr "El hash nun concasa pa: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nun s'alcontró la distribución '%s' pa '%s'" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nun s'alcontró la versión '%s' pa '%s'" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Nun pudo alcontrase la xera '%s'" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nun pudo alcontrase dengún paquete por regex '%s'" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Nun pudo alcontrase dengún paquete por regex '%s'" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Nun pueden seleicionase versiones pal paquete'%s' como puramente virtual" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3280,21 +3291,21 @@ msgstr "" "Nun puede seleicionase l'instalador o versión candidata pal paquete '%s' " "como non tien nengún d'ellos" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Nun puede seleicionase la versión más nueva pal paquete'%s' como puramente " "virtual" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Nun puede seleicionase versión candidata pal paquete %s que nun tien " "candidata" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/bg.po b/po/bg.po index a7745b195..d05603db6 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -115,7 +115,7 @@ msgstr "Трябва да въведете поне един шаблон за msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Тази командата е остаряла. Използвайте „apt-mark showauto“ вместо нея." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Пакетът %s не може да бъде намерен" @@ -741,7 +741,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -918,7 +919,7 @@ msgstr "Времето за установяване на връзка с гне msgid "Unable to accept connection" msgstr "Невъзможно е да се приеме свързването" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Проблем при хеширане на файла" @@ -1108,15 +1109,15 @@ msgstr "HTTP сървърът няма поддръжка за прехвърл msgid "Unknown date format" msgstr "Неизвестен формат на дата" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Невалидни данни на заглавната част" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Неуспех при свързването" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Вътрешна грешка" @@ -1622,33 +1623,33 @@ msgstr "Неуспех при преименуването на %s на %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Поп " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Изт:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Игн " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Грш " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Изтеглени %sB за %s (%sB/сек)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [В процес на работа]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2630,22 +2631,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "грешка при запис, все още име %llu за запис, но не успя" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Проблем при затваряне на файла %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблем при преименуване на файла %s на %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблем при изтриване на файла %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Проблем при синхронизиране на файла" @@ -2938,17 +2939,22 @@ msgstr "Изтегляне на файл %li от %li (остават %s)" msgid "Retrieving file %li of %li" msgstr "Изтегляне на файл %li от %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Неуспех при намирането на драйвер за метод %s." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Методът %s не стартира правилно" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“." @@ -3299,32 +3305,37 @@ msgstr "Не е намерен oторизационен запис за: %s" msgid "Hash mismatch for: %s" msgstr "Несъответствие на контролната сума за: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Не е намерено издание „%s“ на „%s“" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Не е намерена версия „%s“ на „%s“" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Неуспех при намиране на задача „%s“" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Не е възможно избиране на версия за пакета „%s“ понеже е виртуален" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3333,21 +3344,21 @@ msgstr "" "Не е възможно избиране на инсталирана или кандидат версия за пакета „%s“ " "понеже той няма нито едната" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Не е възможно избиране на на последната версия за пакета „%s“, защото е " "виртуален" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Не е възможно избиране на кандидат-версия за пакета „%s“, защото няма " "подходящ кандидати" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/bs.po b/po/bs.po index 32164cd30..510d0b56b 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -112,7 +112,7 @@ msgstr "" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Ne mogu pronaći paket %s" @@ -614,7 +614,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -788,7 +789,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "" @@ -973,15 +974,15 @@ msgstr "" msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Povezivanje neuspješno" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Unutrašnja greška" @@ -1458,33 +1459,33 @@ msgstr "Ne mogu otvoriti %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "" -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "" -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "" -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr "" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2374,22 +2375,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "" @@ -2666,17 +2667,22 @@ msgstr "" msgid "Retrieving file %li of %li" msgstr "Čitam spisak datoteke" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, c-format +msgid "Is the package %s installed?" +msgstr "" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3004,49 +3010,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Ne mogu otvoriti %s" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Ne mogu otvoriti %s" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/ca.po b/po/ca.po index 5b77752af..427ec8de9 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.6\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2012-10-19 13:30+0200\n" "Last-Translator: Jordi Mallach <jordi@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -113,7 +113,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Aquesta ordre és desaconsellada. Empreu «apt-mark showauto» en el seu lloc." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "No s'ha trobat el paquet %s" @@ -725,7 +725,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -901,7 +902,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades" msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@ -1092,15 +1093,15 @@ msgstr "Aquest servidor HTTP té el suport d'abast trencat" msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Error intern" @@ -1609,33 +1610,33 @@ msgstr "No s'ha pogut canviar el nom de %s a %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Obj " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Bai:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "S'ha baixat %sB en %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Treballant]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2614,22 +2615,22 @@ msgstr "llegits, falten %llu per llegir, però no queda res" msgid "write, still have %llu to write but couldn't" msgstr "escrits, falten %llu per escriure però no s'ha pogut" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Ha hagut un problema en tancar el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Ha hagut un problema en reanomenar el fitxer %s a %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Ha hagut un problema en desenllaçar el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" @@ -2918,17 +2919,22 @@ msgstr "S'està obtenint el fitxer %li de %li (falten %s)" msgid "Retrieving file %li of %li" msgstr "S'està obtenint el fitxer %li de %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format 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:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "El mètode %s no s'ha iniciat correctament" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, 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." @@ -3285,34 +3291,39 @@ msgstr "No s'ha pogut trobar el registre d'autenticatió per a: %s" msgid "Hash mismatch for: %s" msgstr "El resum no coincideix per a: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No s'ha trobat la versió puntual «%s» per a «%s»" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No s'ha trobat la versió «%s» per a «%s»" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "No s'ha pogut trobar la tasca «%s»" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format 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:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, 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»" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "No s'han pogut seleccionar les versions del paquet «%s» ja que és purament " "virtual" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3321,21 +3332,21 @@ msgstr "" "No s'han pogut seleccionar la versió instaŀlada ni la candidata del paquet " "«%s» ja que no estan disponibles cap de les dues" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "No s'ha pogut seleccionar la versió més nova del paquet «%s» ja que és " "purament virtual" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "No s'ha pogut seleccionar la versió candidata del paquet %s ja que no té " "candidata" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/cs.po b/po/cs.po index 3f74994f9..b16a65afc 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2012-07-08 13:46+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -111,7 +111,7 @@ msgstr "Musíte zadat alespoň jeden vyhledávací vzor" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Tento příkaz je zastaralý, použijte místo něj „apt-mark showauto“." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Nelze najít balík %s" @@ -723,7 +723,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -898,7 +899,7 @@ msgstr "Spojení datového socketu vypršelo" msgid "Unable to accept connection" msgstr "Nelze přijmout spojení" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problém s kontrolním součtem souboru" @@ -1084,15 +1085,15 @@ msgstr "Tento HTTP server má porouchanou podporu rozsahů" msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Vnitřní chyba" @@ -1599,33 +1600,33 @@ msgstr "Selhalo přejmenování %s na %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Cíl " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Mám:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Staženo %sB za %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Pracuji]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2590,22 +2591,22 @@ msgstr "čtení, stále mám k přečtení %llu, ale už nic nezbývá" msgid "write, still have %llu to write but couldn't" msgstr "zápis, stále mám %llu k zápisu, ale nejde to" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Problém při zavírání souboru %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problém při přejmenování souboru %s na %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Problém při odstraňování souboru %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Problém při synchronizování souboru" @@ -2887,17 +2888,22 @@ msgstr "Stahuji soubor %li z %li (%s zbývá)" msgid "Retrieving file %li of %li" msgstr "Stahuji soubor %li z %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Ovladač metody %s nemohl být nalezen." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s nebyla spuštěna správně" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Vložte prosím disk nazvaný „%s“ do mechaniky „%s“ a stiskněte enter." @@ -3241,32 +3247,37 @@ msgstr "Nelze najít autentizační záznam pro: %s" msgid "Hash mismatch for: %s" msgstr "Neshoda kontrolních součtů pro: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Verze „%s“ pro „%s“ nebyla nalezena" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Nelze najít úlohu „%s“" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Nelze vybrat verze balíku „%s“, protože je čistě virtuální" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3275,17 +3286,17 @@ msgstr "" "Nelze vybrat nainstalovanou ani kandidátskou verzi balíku „%s“, protože " "žádné takové verze nemá" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "Nelze vybrat nejnovější verzi balíku „%s“, protože je čistě virtuální" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "Nelze vybrat kandidátskou verzi balíku %s, protože žádnou nemá" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "Nelze vybrat nainstalované verze balíku %s, protože není nainstalován" diff --git a/po/cy.po b/po/cy.po index b971b013b..cfe41d071 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -126,7 +126,7 @@ msgstr "Rhaid i chi ddarparu un patrwm yn union" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" @@ -728,7 +728,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -910,7 +911,7 @@ msgstr "Goramserodd cysylltiad y soced data" msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@ -1101,16 +1102,16 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/server.cc:490 +#: methods/server.cc:494 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Gwall mewnol" @@ -1613,33 +1614,33 @@ msgstr "Methwyd ailenwi %s at %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Presennol " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Cyrchu:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Anwybyddu " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Gwall " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Cyrchwyd %sB yn %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Gweithio]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, fuzzy, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2628,22 +2629,22 @@ msgstr "o hyd %lu i ddarllen ond dim ar ôl" msgid "write, still have %llu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -2939,17 +2940,22 @@ msgstr "" msgid "Retrieving file %li of %li" msgstr "Yn Darllen Rhestr Ffeiliau" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Methwyd canfod y gyrrydd dull %s." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, c-format +msgid "Is the package %s installed?" +msgstr "" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Ni gychwynodd y dull %s yn gywir" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3298,49 +3304,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Methwyd canfod pecyn %s" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/da.po b/po/da.po index aea3dc547..4d0f6876d 100644 --- a/po/da.po +++ b/po/da.po @@ -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: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2013-12-14 23:51+0200\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n" @@ -115,7 +115,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Denne kommando er forældet. Brug venligst »apt-mark showauto« i stedet for." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Kunne ikke lokalisere pakken %s" @@ -738,7 +738,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -926,7 +927,7 @@ msgstr "Tidsudløb på datasokkel-forbindelse" msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@ -1117,15 +1118,15 @@ msgstr "" msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Intern fejl" @@ -1624,33 +1625,33 @@ msgstr "Kunne ikke fortolke %s. Rediger igen? " msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "Din »%s« fil blev ændret, kør venligst »apt-get update«." -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Havde " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Henter:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ignorerer " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Fejl " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Hentede %sB på %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Arbejder]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2622,22 +2623,22 @@ msgstr "læs, mangler stadig at læse %llu men der er ikke flere" msgid "write, still have %llu to write but couldn't" msgstr "skriv, mangler stadig at skrive %llu men kunne ikke" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Problem under lukning af filen %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem under omdøbning af filen %s til %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Fejl ved frigivelse af filen %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" @@ -2922,17 +2923,22 @@ msgstr "Henter fil %li ud af %li (%s tilbage)" msgid "Retrieving file %li of %li" msgstr "Henter fil %li ud af %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Metodedriveren %s blev ikke fundet." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Tjek om pakken »dpkg-dev« er installeret.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s startede ikke korrekt" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, 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." @@ -3276,32 +3282,37 @@ msgstr "Kan ikke finde godkendelsesregistrering for: %s" msgid "Hash mismatch for: %s" msgstr "Hashsum stemmer ikke: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Udgaven »%s« for »%s« blev ikke fundet" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versionen »%s« for »%s« blev ikke fundet" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Kunne ikke finde opgaven »%s«" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Kunne ikke finde nogle pakker med regulært udtryk »%s«" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Kunne ikke finde nogle pakker med regulært udtryk »%s«" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Kan ikke vælge versioner fra pakke »%s« som er vitalt" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3310,18 +3321,18 @@ msgstr "" "Kan ikke vælge installeret eller kandidatversion fra pakke »%s« da den ikke " "har nogen af dem" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "Kan ikke vælge nyeste version fra pakke »%s« som er vital" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Kan ikke vælge kandidatversion fra pakke %s da den ikke har nogen kandidat" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/de.po b/po/de.po index b09db2f4b..5a01fdc46 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2012-06-27 10:55+0200\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" @@ -116,7 +116,7 @@ msgstr "" "Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark " "showauto«." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Paket %s kann nicht gefunden werden." @@ -758,7 +758,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -938,7 +939,7 @@ msgstr "Zeitüberschreitung bei Datenverbindungsaufbau" msgid "Unable to accept connection" msgstr "Verbindung konnte nicht angenommen werden." -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem bei Bestimmung des Hashwertes einer Datei" @@ -1136,15 +1137,15 @@ msgstr "" msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Interner Fehler" @@ -1655,33 +1656,33 @@ msgstr "%s konnte nicht in %s umbenannt werden." msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "OK " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Holen: " -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Fehl " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Es wurden %sB in %s geholt (%sB/s).\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Wird verarbeitet]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2674,22 +2675,22 @@ msgstr "" "Schreibvorgang: es verbleiben noch %llu zu schreiben, Schreiben ist jedoch " "nicht möglich." -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Problem beim Schließen der Datei %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem beim Umbenennen der Datei %s nach %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem beim Entfernen (unlink) der Datei %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Problem beim Synchronisieren der Datei" @@ -2978,17 +2979,22 @@ msgstr "Holen der Datei %li von %li (noch %s)" msgid "Retrieving file %li of %li" msgstr "Holen der Datei %li von %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Der Treiber für Methode %s konnte nicht gefunden werden." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Methode %s ist nicht korrekt gestartet." -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3354,34 +3360,39 @@ msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s" msgid "Hash mismatch for: %s" msgstr "Hash-Summe stimmt nicht überein für: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden." -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version »%s« für »%s« konnte nicht gefunden werden." -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Task »%s« konnte nicht gefunden werden." -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden." -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden." + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Es können keine Versionen von Paket »%s« ausgewählt werden, da es rein " "virtuell ist." -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3390,21 +3401,21 @@ msgstr "" "Es kann weder eine installierte Version noch ein Installationskandidat von " "Paket »%s« ausgewählt werden, da beide nicht existieren." -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Die neueste Version von Paket »%s« kann nicht ausgewählt werden, da es rein " "virtuell ist." -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Es kann kein Installationskandidat von Paket »%s« ausgewählt werden, da kein " "solcher existiert." -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/dz.po b/po/dz.po index 58d1e9abf..33fb41b1a 100644 --- a/po/dz.po +++ b/po/dz.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -117,7 +117,7 @@ msgstr "ཁྱོད་ཀྱིས་ཏག་ཏག་སྦེ་དཔེ་ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།" @@ -706,7 +706,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -882,7 +883,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ན msgid "Unable to accept connection" msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།" @@ -1071,15 +1072,15 @@ msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བ msgid "Unknown date format" msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "ནང་འཁོད་འཛོལ་བ།" @@ -1574,33 +1575,33 @@ msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "ཨེབ།" -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "ལེན:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "ཨེལ་ཇི་ཨེན:" -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "ཨི་ཨར་ཨར།" -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%s (%sB/s)་ནང་ལུ་%sB་དེ་ལེན་ཡོདཔ་ཨིན།\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [ལཱ་འབད་དོ།]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2577,22 +2578,22 @@ msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་% msgid "write, still have %llu to write but couldn't" msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" @@ -2877,17 +2878,22 @@ msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི msgid "Retrieving file %li of %li" msgstr " %li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་" @@ -3224,49 +3230,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/el.po b/po/el.po index 0d91aceef..7de89c394 100644 --- a/po/el.po +++ b/po/el.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -122,7 +122,7 @@ msgstr "Πρέπει να δώσετε τουλάχιστον ένα μοτίβ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Αδυναμία εντοπισμού του πακέτου %s" @@ -718,7 +718,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -893,7 +894,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" @@ -1085,15 +1086,15 @@ msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρω msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" @@ -1594,33 +1595,33 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Hit " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Φέρε:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Αγνόησε " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Σφάλμα " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Μεταφορτώθηκαν %sB σε %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Επεξεργασία]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2601,22 +2602,22 @@ msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για αν msgid "write, still have %llu to write but couldn't" msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" @@ -2900,17 +2901,22 @@ msgstr "Κατέβασμα του αρχείου %li του %li (απομένο msgid "Retrieving file %li of %li" msgstr "Λήψη αρχείου %li του %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3253,49 +3259,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Αδύνατη η εύρεση του πακέτου %s" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/es.po b/po/es.po index c87710e2d..df53d6c2d 100644 --- a/po/es.po +++ b/po/es.po @@ -33,7 +33,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: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2011-01-24 11:47+0100\n" "Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n" "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -167,7 +167,7 @@ msgstr "Debe proporcionar al menos un patrón de búsqueda" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "No se ha podido localizar el paquete %s" @@ -778,7 +778,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -953,7 +954,7 @@ msgstr "Expiró conexión a socket de datos" msgid "Unable to accept connection" msgstr "No pude aceptar la conexión" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Se produjo un problema al hacer un hash del archivo" @@ -1142,15 +1143,15 @@ msgstr "Éste servidor de http tiene el soporte de alcance roto" msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Fallo la conexión" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Error interno" @@ -1660,33 +1661,33 @@ msgstr "No pude abrir %s.new" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Obj " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Des:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Descargados %sB en %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Trabajando]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2673,22 +2674,22 @@ msgstr "leídos, todavía debía leer %lu pero no queda nada" msgid "write, still have %llu to write but couldn't" msgstr "escritos, todavía tenía que escribir %lu pero no pude hacerlo" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Se produjo un problema al cerrar el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Se produjo un problema al renombrar el fichero %s a %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Se produjo un problema al desligar el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Se produjo un problema al sincronizar el fichero" @@ -2982,17 +2983,22 @@ msgstr "Descargando fichero %li de %li (falta %s)" msgid "Retrieving file %li of %li" msgstr "Descargando fichero %li de %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "No se pudo encontrar el método %s." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "El método %s no se inició correctamente" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Por favor, inserte el disco «%s» en la unidad «%s» y pulse Intro." @@ -3343,34 +3349,39 @@ msgstr "No se pudo encontrar un registro de autenticación para: %s" msgid "Hash mismatch for: %s" msgstr "La suma hash difiere para: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No se encontró la Distribución «%s» para «%s»" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No se encontró la versión «%s» para «%s»" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "No se pudo encontrar la tarea «%s»" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "No se pueden seleccionar distintas versiones del paquete «%s» porque es " "puramente virtual" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3379,21 +3390,21 @@ msgstr "" "No se puede seleccionar una versión instalada o candidata para el paquete " "«%s» dado que éste no tiene ninguna de éstas" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "No se puede seleccionar la última versión del paquete «%s» dado que es " "puramente virtual" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "No se puede seleccionar una versión candidata del paquete %s dado que no " "tiene candidatos" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/eu.po b/po/eu.po index fbde6d3f8..3f1fd165a 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -114,7 +114,7 @@ msgstr "Zehazki eredu bat eman behar duzu." msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Ezin da %s paketea lokalizatu" @@ -705,7 +705,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -884,7 +885,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du" msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@ -1072,15 +1073,15 @@ msgstr "http zerbitzariak barruti onarpena apurturik du" msgid "Unknown date format" msgstr "Datu formatu ezezaguna" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Barne errorea" @@ -1582,33 +1583,33 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Atzituta " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Hartu:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ez ikusi " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Lortuta: %sB (%s) (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Lanean]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2580,22 +2581,22 @@ msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen" msgid "write, still have %llu to write but couldn't" msgstr "idatzita; oraindik %lu idazteke, baina ezin da" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Arazoa fitxategia ixtean" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Arazoa fitxategia sinkronizatzean" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Arazoa fitxategia desestekatzean" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Arazoa fitxategia sinkronizatzean" @@ -2878,17 +2879,22 @@ msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)" msgid "Retrieving file %li of %li" msgstr "%li fitxategia jasotzen %li-tik" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "%s metodoa ez da behar bezala abiarazi" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu" @@ -3223,49 +3229,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Egiaztapena ez dator bat" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Ezin izan da %s zeregina aurkitu" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Ezin izan da %s paketea aurkitu" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Ezin izan da %s paketea aurkitu" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/fi.po b/po/fi.po index 8d8400609..96e3f9f8f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -114,7 +114,7 @@ msgstr "On annettava täsmälleen yksi lauseke" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Pakettia %s ei löydy" @@ -700,7 +700,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -875,7 +876,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@ -1064,15 +1065,15 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki" msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Sisäinen virhe" @@ -1574,33 +1575,33 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Löytyi " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Nouda:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Siv " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Vrhe " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Noudettiin %st ajassa %s (%st/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Työskennellään]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2571,22 +2572,22 @@ msgstr "read, vielä %lu lukematta mutta tiedosto loppui" msgid "write, still have %llu to write but couldn't" msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Pulmia tiedoston sulkemisessa" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Pulmia tehtäessä tiedostolle sync" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Pulmia tehtäessä tiedostolle unlink" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Pulmia tehtäessä tiedostolle sync" @@ -2867,17 +2868,22 @@ msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)" msgid "Retrieving file %li of %li" msgstr "Noudetaan tiedosto %li / %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Menetelmän ajuria %s ei löytynyt" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Menetelmä %s ei käynnistynyt oikein" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Pistä levy nimeltään: \"%s\" asemaan \"%s\" ja paina Enter." @@ -3215,49 +3221,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Kohteen %s tarkistussumma ei täsmää" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Tehtävää %s ei löytynyt" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Pakettia %s ei löytynyt" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Pakettia %s ei löytynyt" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/fr.po b/po/fr.po index 68ef07aa9..c9c34758f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2013-08-17 07:57+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -113,7 +113,7 @@ msgstr "Vous devez fournir au moins un motif de recherche" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Cette commande est obsolète. Veuillez utiliser « apt-mark showauto »." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Impossible de trouver le paquet %s" @@ -762,7 +762,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -941,7 +942,7 @@ msgstr "Délai de connexion au port de données dépassé" msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problème de hachage du fichier" @@ -1135,15 +1136,15 @@ msgstr "Ce serveur http possède un support des limites non-valide" msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Mauvais en-tête de donnée" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Échec de la connexion" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Erreur interne" @@ -1664,33 +1665,33 @@ msgstr "Impossible de changer le nom %s en %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Atteint " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Réception de : " -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%so réceptionnés en %s (%so/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [En cours]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2682,22 +2683,22 @@ msgstr "lu(s), %llu restant à lire, mais rien n'est disponible" msgid "write, still have %llu to write but couldn't" msgstr "écrit(s), %llu restant à écrire, mais l'écriture est impossible" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Problème de fermeture du fichier %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problème de renommage du fichier %s en %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Problème de suppression du lien %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Problème de synchronisation du fichier" @@ -2997,17 +2998,22 @@ msgstr "Téléchargement du fichier %li sur %li (%s restant)" msgid "Retrieving file %li of %li" msgstr "Téléchargement du fichier %li sur %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Le pilote pour la méthode %s n'a pu être trouvé." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "La méthode %s n'a pas démarré correctement" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3376,36 +3382,43 @@ msgstr "Impossible de trouver l'enregistrement d'authentification pour %s" msgid "Hash mismatch for: %s" msgstr "Somme de contrôle de hachage incohérente pour %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "La version « %s » de « %s » est introuvable" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "La version « %s » de « %s » n'a pu être trouvée" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Impossible de trouver la tâche « %s »" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "" "Impossible de trouver de paquet correspondant à l'expression rationnelle " "« %s »" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "" +"Impossible de trouver de paquet correspondant à l'expression rationnelle " +"« %s »" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Impossible de choisir les versions du paquet « %s » qui n'est qu'un paquet " "virtuel" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3414,20 +3427,20 @@ msgstr "" "Impossible de choisir une version installée ou candidate du paquet « %s » " "qui n'en n'a aucune" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Impossible de choisir une nouvelle version du paquet « %s » qui n'est qu'un " "paquet virtuel" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Impossible de choisir une version candidate du paquet « %s » qui n'en n'a pas" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/gl.po b/po/gl.po index 70aa59a65..66226393f 100644 --- a/po/gl.po +++ b/po/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -116,7 +116,7 @@ msgstr "Debe fornecer cando menos un patrón de busca" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Non foi posíbel atopar o paquete %s" @@ -723,7 +723,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -899,7 +900,7 @@ msgstr "A conexión do socket de datos esgotou o tempo" msgid "Unable to accept connection" msgstr "Non é posíbel aceptar a conexión" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Xurdiu un problema ao calcular o hash do ficheiro" @@ -1091,15 +1092,15 @@ msgstr "Este servidor HTTP ten a compatibilidade de rangos estragada" msgid "Unknown date format" msgstr "Formato de datos descoñecido" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Datos da cabeceira incorrectos" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Produciuse un fallo na conexión" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Produciuse un erro interno" @@ -1611,33 +1612,33 @@ msgstr "Non foi posíbel cambiar o nome de %s a %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Teño " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Rcb:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Obtivéronse %sB en %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Traballando]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2620,22 +2621,22 @@ msgstr "lectura, aínda hai %lu para ler pero non queda ningún" msgid "write, still have %llu to write but couldn't" msgstr "escritura, aínda hai %lu para escribir pero non se puido" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Produciuse un problema ao pechar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Produciuse un problema ao renomear o ficheiro %s a %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Produciuse un problema ao desligar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Produciuse un problema ao sincronizar o ficheiro" @@ -2924,17 +2925,22 @@ msgstr "Obtendo o ficheiro %li de %li (restan %s)" msgid "Retrieving file %li of %li" msgstr "Obtendo o ficheiro %li de %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Non foi posíbel atopar o controlador de métodos %s." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "O método %s non se iniciou correctamente" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Insira o disco etiquetado: «%s» na unidade «%s» e prema Intro." @@ -3285,34 +3291,39 @@ msgstr "Non é posíbel atopar un rexistro de autenticación para: %s" msgid "Hash mismatch for: %s" msgstr "Valor de hash non coincidente para: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Non se atopou a publicación «%s» de «%s»" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Non se atopou a versión «%s» de «%s»" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Non foi posíbel atopar a tarefa «%s»" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Non é posíbel seleccionar distintas versións do paquete «%s» xa que é " "puramente virtual" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3321,21 +3332,21 @@ msgstr "" "Non é posíbel seleccionar nin a versión instalada nin a candidata do paquete " "«%s» xa que non ten ningunha delas" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Non é posíbel seleccionar a versión máis recente do paquete «%s» xa que é " "puramente virtual" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Non é posíbel seleccionar a versión candidata do paquete %s xa que non ten " "candidata" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/hu.po b/po/hu.po index 9a8c47b71..a4e9c1986 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt trunk\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2012-06-25 17:09+0200\n" "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n" "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n" @@ -115,7 +115,7 @@ msgstr "Legalább egy keresési mintát meg kell adnia" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Ez a parancs elavult. Használja helyette az „apt-mark showauto”-t." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Ez a csomag nem található: %s" @@ -739,7 +739,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -918,7 +919,7 @@ msgstr "Az adatfoglalathoz kapcsolódás túllépte az időkorlátot" msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@ -1105,15 +1106,15 @@ msgstr "A HTTP-kiszolgáló tartománytámogatása sérült" msgid "Unknown date format" msgstr "Ismeretlen dátumformátum" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Rossz fejlécadatok" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Sikertelen kapcsolódás" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Belső hiba" @@ -1616,33 +1617,33 @@ msgstr "„%s” átnevezése sikertelen erre: %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Találat " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Letöltés:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Mellőz " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Hiba " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Letöltve %sB %s alatt (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Folyamatban]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2622,22 +2623,22 @@ msgstr "olvasás, még kellene %llu, de már az összes elfogyott" msgid "write, still have %llu to write but couldn't" msgstr "írás, még kiírandó %llu, de ez nem lehetséges" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Hiba a(z) %s fájl bezárásakor" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Hiba a(z) %s fájl átnevezésekor erre: %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Hiba a(z) %s fájl törlésekor" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Hiba a fájl szinkronizálásakor" @@ -2930,17 +2931,22 @@ msgstr "%li/%li fájl letöltése (%s marad)" msgid "Retrieving file %li of %li" msgstr "%li/%li fájl letöltése" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "A(z) %s metódusvezérlő nem található." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "A(z) %s metódus nem indult el megfelelően" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3290,32 +3296,37 @@ msgstr "%s hitelesítési rekordja nem található" msgid "Hash mismatch for: %s" msgstr "%s ellenőrzőösszege nem megfelelő" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "„%s” kiadás nem található ehhez: „%s”" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "„%s” verzió nem található ehhez: „%s”" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "„%s” feladat nem található" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "„%s” csomagból nem választható verzió, mert teljesen virtuális" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3324,19 +3335,19 @@ msgstr "" "„%s” csomagból nem választható sem telepített, sem kiadásra jelölt verzió, " "mert egyikkel sem rendelkezik" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "„%s” csomag legújabb verziója nem választható ki, mert teljesen virtuális" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "„%s” csomag kiadásra jelölt verziója nem választható ki, mert nincs jelöltje" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/it.po b/po/it.po index 2b3ece7f4..f14683c9c 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2013-08-27 22:06+0200\n" "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -115,7 +115,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Questo comando è deprecato. Utilizzare \"apt-mark showauto\" al suo posto." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Impossibile trovare il pacchetto %s" @@ -753,7 +753,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -930,7 +931,7 @@ msgstr "Connessione al socket dati terminata" msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Si è verificato un problema nel creare l'hash del file" @@ -1123,15 +1124,15 @@ msgstr "Questo server HTTP ha un supporto del range non corretto" msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Header dati non corretto" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Connessione non riuscita" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Errore interno" @@ -1645,34 +1646,34 @@ msgstr "Rinomina di %s in %s non riuscita" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Trovato " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Scaricamento di:" # (ndt) questa non so cosa voglia dire -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Recuperati %sB in %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [In lavorazione]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2663,22 +2664,22 @@ msgstr "lettura, ancora %llu da leggere, ma non è stato trovato nulla" msgid "write, still have %llu to write but couldn't" msgstr "scrittura, ancora %llu da scrivere, ma non è possibile" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Si è verificato un problema nel chiudere il file %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Si è verificato un problema nel rinominare il file %s in %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Si è verificato un problema nel sincronizzare il file" @@ -2977,17 +2978,22 @@ msgstr "Scaricamento file %li di %li (%s rimanente)" msgid "Retrieving file %li of %li" msgstr "Scaricamento file %li di %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Impossibile trovare un driver per il metodo %s." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Il metodo %s non si è avviato correttamente" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio." @@ -3346,35 +3352,41 @@ msgid "Hash mismatch for: %s" msgstr "Hash non corrispondente per %s" # (ndt) dovrebbe essere inteso il file Release -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release \"%s\" per \"%s\" non trovato." # (ndt) dovrebbe essere inteso il Version -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version \"%s\" per \"%s\" non trovato" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Impossibile trovare il task \"%s\"" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "" "Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\"" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "" +"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\"" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Impossibile selezionare le versioni dal pacchetto \"%s\" poiché è virtuale" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3383,21 +3395,21 @@ msgstr "" "Impossibile selezionare la versione installata o la candidata dal pacchetto " "\"%s\" poiché non sono presenti" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Impossibile selezionare la versione più recente dal pacchetto \"%s\" poiché " "è virtuale" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Impossibile selezionare la versione candidata dal pacchetto %s poiché non ha " "alcun candidato" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/ja.po b/po/ja.po index e30393043..8000cda34 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.9.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2013-08-11 19:39+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -113,7 +113,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "このコマンドは時代遅れです。'apt-mark showauto' を代わりに使用してください。" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "パッケージ %s が見つかりません" @@ -743,7 +743,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -918,7 +919,7 @@ msgstr "データソケット接続タイムアウト" msgid "Unable to accept connection" msgstr "接続を accept できません" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" @@ -1106,15 +1107,15 @@ msgstr "HTTP サーバのレンジサポートが壊れています" msgid "Unknown date format" msgstr "不明な日付フォーマットです" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "不正なヘッダです" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "接続失敗" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "内部エラー" @@ -1614,33 +1615,33 @@ msgstr "%s を %s に名前変更できませんでした" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "ヒット " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "取得:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "無視 " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "エラー " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%sB を %s で取得しました (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [処理中]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2610,22 +2611,22 @@ msgstr "読み込みが %llu 残っているはずですが、何も残ってい msgid "write, still have %llu to write but couldn't" msgstr "あと %llu 書き込む必要がありますが、書き込むことができませんでした" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "ファイル %s のクローズ中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s から %s へのファイル名変更中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "ファイル %s の削除中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "ファイルの同期中に問題が発生しました" @@ -2913,17 +2914,23 @@ msgstr "ファイルを取得しています %li/%li (残り %s)" msgid "Retrieving file %li of %li" msgstr "ファイルを取得しています %li/%li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "メソッドドライバ %s が見つかりません。" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "" +"'dpkg-dev' パッケージがインストールされていることを確認してください。\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "メソッド %s が正常に開始しませんでした" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3279,32 +3286,37 @@ msgstr "認証レコードが見つかりません: %s" msgid "Hash mismatch for: %s" msgstr "ハッシュサムが適合しません: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "タスク '%s' が見つかりません" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "正規表現 '%s' ではパッケージは見つかりませんでした" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "正規表現 '%s' ではパッケージは見つかりませんでした" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "純粋な仮想パッケージのため、パッケージ '%s' のバージョンを選べません" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3313,18 +3325,18 @@ msgstr "" "パッケージ '%s' のインストール済みまたは候補のバージョンはいずれも存在しない" "ので選べません" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "純粋な仮想パッケージのため、パッケージ '%s' の最新バージョンを選べません" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "候補が存在しないので、パッケージ %s の候補バージョンを選べません" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/km.po b/po/km.po index 60090a304..76940e49c 100644 --- a/po/km.po +++ b/po/km.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -118,7 +118,7 @@ msgstr "អ្នក​ត្រូវ​តែ​ផ្ដល់​លំនា msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "មិន​អាច​កំណត់​ទីតាំង​កញ្ចប់ %s បានឡើយ" @@ -698,7 +698,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -872,7 +873,7 @@ msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័ msgid "Unable to accept connection" msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ" @@ -1057,15 +1058,15 @@ msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូ msgid "Unknown date format" msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "ទិន្នន័យ​បឋមកថា​ខូច" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "កំហុស​ខាង​ក្នុង​" @@ -1556,33 +1557,33 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "វាយ​" -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "យក​ ៖" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "បាន​ទៅ​ប្រមូល​ %sB ក្នុង​ %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [កំពុង​ធ្វើការ​]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2549,22 +2550,22 @@ msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អា msgid "write, still have %llu to write but couldn't" msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" @@ -2846,17 +2847,22 @@ msgstr "កំពុង​ទៅ​យក​ឯកសារ %li នៃ %li (ន msgid "Retrieving file %li of %li" msgstr "កំពុង​ទៅយក​ឯកសារ %li នៃ %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។" @@ -3189,49 +3195,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/ko.po b/po/ko.po index 2ee50c339..02d0e2fc9 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -109,7 +109,7 @@ msgstr "최소 한 개의 검색어를 지정해야 합니다" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "%s 패키지를 찾을 수 없습니다" @@ -705,7 +705,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -880,7 +881,7 @@ msgstr "데이터 소켓 연결 시간 초과" msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" @@ -1065,15 +1066,15 @@ msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "내부 오류" @@ -1571,33 +1572,33 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "기존 " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "받기:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "무시" -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "오류 " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "내려받기 %s바이트, 소요시간 %s (%s바이트/초)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [작업중]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2565,22 +2566,22 @@ msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습 msgid "write, still have %llu to write but couldn't" msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "%s 파일을 닫는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s 파일을 %s(으)로 이름을 바꾸는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "%s 파일을 삭제하는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "파일을 동기화하는데 문제가 있습니다" @@ -2865,17 +2866,22 @@ msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)" msgid "Retrieving file %li of %li" msgstr "파일 받아오는 중: %2$li 중 %1$li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3211,32 +3217,37 @@ msgstr "다음의 인증 기록을 찾을 수 없습니다: %s" msgid "Hash mismatch for: %s" msgstr "다음의 해시가 다릅니다: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "'%s' 작업을 찾을 수 없습니다" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "'%s' 정규식에 해당하는 패키지가 없습니다" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "'%s' 정규식에 해당하는 패키지가 없습니다" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "'%s' 패키지는 가상 패키지이므로 버전을 선택할 수 없습니다" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3245,17 +3256,17 @@ msgstr "" "'%s' 패키지에서 설치한 버전이나 후보 버전을 선택할 수 없습니다. 둘 다 아닙니" "다." -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "'%s' 패키지에서 최신 버전을 선택할 수 없습니다. 가상 패키지입니다." -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보가 없습니다." -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다." diff --git a/po/ku.po b/po/ku.po index 31f7720f0..6f8ca5971 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n" "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n" @@ -117,7 +117,7 @@ msgstr "Pêwist e tu mînakekê bidî" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Pakêt nehate dîtin %s" @@ -620,7 +620,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -792,7 +793,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "" @@ -979,15 +980,15 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Girêdan pêk nehatiye" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Çewtiya hundirîn" @@ -1463,33 +1464,33 @@ msgstr "%s ji hev nehate veçirandin" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "" -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Anîn:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "" -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Çewt" -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, fuzzy, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%s hatine anîn..." -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Dixebite]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2394,22 +2395,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "" @@ -2684,17 +2685,22 @@ msgstr "" msgid "Retrieving file %li of %li" msgstr "Pel tê anîn %li ji %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, c-format +msgid "Is the package %s installed?" +msgstr "" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne" @@ -3021,49 +3027,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Hash Sum li hev nayên" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Peywira %s nehate dîtin" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nikarî pakêta %s bibîne" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Nikarî pakêta %s bibîne" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/lt.po b/po/lt.po index 02bd75fbb..11eb43021 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -115,7 +115,7 @@ msgstr "" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Nepavyko rasti paketo %s" @@ -624,7 +624,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -795,7 +796,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "" @@ -979,15 +980,15 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Prisijungti nepavyko" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Vidinė klaida" @@ -1478,33 +1479,33 @@ msgstr "Nepavyko pervadinti %s į %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Imamas " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Gauti:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ignoruotas " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Klaida " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Parsiųsta %sB iš %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Vykdoma]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2483,22 +2484,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Klaida sinchronizuojant failą" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Klaida sinchronizuojant failą" @@ -2773,17 +2774,22 @@ msgstr "Parsiunčiamas %li failas iš %li (liko %s)" msgid "Retrieving file %li of %li" msgstr "Parsiunčiamas %li failas iš %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Įdėkite diską „%s“ į įrenginį „%s“ ir paspauskite Enter." @@ -3113,49 +3119,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Maišos sumos nesutapimas" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nebuvo rasta „%s“ versija paketui „%s“" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Nepavyko rasti užduoties %s" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nepavyko rasti paketo %s" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Nepavyko rasti paketo %s" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/mr.po b/po/mr.po index 0714bc52d..72d2bf5b2 100644 --- a/po/mr.po +++ b/po/mr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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 " @@ -112,7 +112,7 @@ msgstr "तुम्हाला फक्त एकच नमुना द् msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "पॅकेज %s शोधण्यास असमर्थ आहे" @@ -694,7 +694,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -869,7 +870,7 @@ msgstr "डेटा सॉकेट जोडणी वेळेअभावी msgid "Unable to accept connection" msgstr "जोडणी स्विकारण्यास असमर्थ" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "फाईल हॅश करण्यात त्रुटी" @@ -1055,15 +1056,15 @@ msgstr "HTTP सर्व्हरने विस्तार तांत् msgid "Unknown date format" msgstr "अपरिचित दिनांक प्रकार/स्वरूप " -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "चुकीचा शीर्षक डाटा" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "जोडणी अयशस्वी" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "अंतर्गत त्रुटी" @@ -1560,33 +1561,33 @@ msgstr "%s ला पुनर्नामांकन %s करण्यास msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "दाबा" -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "मिळवा:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "आय.जी.एन." -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "दोष इ.आर.आर." -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%s (%sB/s) मध्ये %sB मिळविला\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr "[काम करत आहे]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2554,22 +2555,22 @@ msgstr "वाचा, %lu अजूनही वाचण्यासाठी msgid "write, still have %llu to write but couldn't" msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "फाईल बंद करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "संचिकेची syncing समस्या" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "फाईल अनलिंकिंग करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "संचिकेची syncing समस्या" @@ -2851,17 +2852,22 @@ msgstr "%li ची %li(%s राहिलेले) संचिका पुन msgid "Retrieving file %li of %li" msgstr "%li ची %li संचिका पुन:प्राप्त करीत आहे" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. " -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा." @@ -3200,49 +3206,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "हॅश बेरीज जुळत नाही" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "%s कार्य सापडू शकले नाही" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "%s पॅकेज सापडू शकले नाही" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "%s पॅकेज सापडू शकले नाही" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/nb.po b/po/nb.po index 5249ddabc..cbd14b77c 100644 --- a/po/nb.po +++ b/po/nb.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -116,7 +116,7 @@ msgstr "Du må oppgi minst ett søkemønster" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Klarer ikke å finne pakken %s" @@ -709,7 +709,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -886,7 +887,7 @@ msgstr "Tidsavbrudd på tilkoblingen til datasokkelen" msgid "Unable to accept connection" msgstr "Klarte ikke å godta tilkoblingen" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem ved oppretting av nøkkel for fil" @@ -1073,15 +1074,15 @@ msgstr "Denne HTTP-tjeneren har ødelagt støtte for område" msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Ødelagte hodedata" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Intern feil" @@ -1585,33 +1586,33 @@ msgstr "Klarte ikke å endre navnet på %s til %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Funnet " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Hent:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Feil " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Hentet %sB på %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Arbeider]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2584,22 +2585,22 @@ msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen" msgid "write, still have %llu to write but couldn't" msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Problem ved låsing av fila %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem ved endring av navn på fila %s til %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem ved oppheving av lenke til fila %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Problem ved oppdatering av fila" @@ -2883,17 +2884,22 @@ msgstr "Henter fil %li av %li (%s gjenværende)" msgid "Retrieving file %li of %li" msgstr "Henter fil %li av %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Finner ikke metode-driveren %s." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Sjekk om pakken «dpkg-dev» er installert.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s startet ikke korrekt" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Sett inn disken merket «%s» i lagringsenheten «%s» og trykk Enter." @@ -3232,32 +3238,37 @@ msgstr "Klarte ikke finne autentiseringsoppføring for: %s" msgid "Hash mismatch for: %s" msgstr "Hashsummen stemmer ikke for: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgave «%s» av «%s» ble ikke funnet" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versjon «%s» av «%s» ble ikke funnet" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Klarte ikke å finne oppgave «%s»" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Klarte ikke finne noen pakken med regex «%s»" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Klarte ikke finne noen pakken med regex «%s»" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Klarte ikke velge versjoner fra pakken «%s» siden den er kun virtuell" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3266,20 +3277,20 @@ msgstr "" "Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den " "har ingen av dem" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Klarte ikke velge nyeste versjon fra pakken «%s» siden den er kun virtuell" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Klarte ikke velge kandidatversjon fra pakken «%s» siden den ikke har noen " "kandidat" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/ne.po b/po/ne.po index a8fa67496..b5aa74499 100644 --- a/po/ne.po +++ b/po/ne.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -115,7 +115,7 @@ msgstr "तपाईँले एउटा वास्तविक बान् msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "प्याकेज %s तोक्न असक्षम भयो" @@ -696,7 +696,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -871,7 +872,7 @@ msgstr "डेटा सकेटको जडान समय सकियो" msgid "Unable to accept connection" msgstr "जडान स्वीकार गर्न असक्षम भयो" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "समस्या द्रुतान्वेषण फाइल" @@ -1056,15 +1057,15 @@ msgstr "HTTP सर्भर संग भाँचिएको दायरा msgid "Unknown date format" msgstr "अज्ञात मिति ढाँचा" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "खराब हेडर डेटा" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "जडान असफल भयो" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "आन्तरिक त्रुटि" @@ -1557,33 +1558,33 @@ msgstr " %s मा %s पुन:नामकरण असफल भयो" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "हान्नुहोस्" -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "प्राप्त गर्नुहोस्:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%s (%sB/s) मा %sB मा तानियो\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [काम गरिरहेको]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2551,22 +2552,22 @@ msgstr "पड्नुहोस्, अहिले सम्म %lu पढ् msgid "write, still have %llu to write but couldn't" msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन " -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "फाइल बन्द गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "फाइल गुप्तिकरण गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "फाइल अनलिङ्क गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "फाइल गुप्तिकरण गर्दा समस्या" @@ -2848,17 +2849,22 @@ msgstr "%li को %li फाइल पुन:प्राप्त गरिद msgid "Retrieving file %li of %li" msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "विधि %s सही रुपले सुरू हुन सकेन" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । " @@ -3191,49 +3197,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "MD5Sum मेल भएन" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "प्याकेज फेला पार्न सकिएन %s" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/nl.po b/po/nl.po index 157f67583..e24f6d2d6 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.15.9\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2011-12-05 17:10+0100\n" "Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n" "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -115,7 +115,7 @@ msgstr "U dient precies één zoekpatroon op te geven" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Kan pakket %s niet vinden" @@ -721,7 +721,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -897,7 +898,7 @@ msgstr "Datasocket verbinding is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" @@ -1090,15 +1091,15 @@ msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Interne fout" @@ -1605,33 +1606,33 @@ msgstr "Hernoemen van %s naar %s is mislukt" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Geraakt " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Ophalen:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Genegeerd " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Fout " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%sB opgehaald in %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Bezig]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2618,22 +2619,22 @@ msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar" msgid "write, still have %llu to write but couldn't" msgstr "schrijf, de laatste %lu konden niet weggeschreven worden" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Probleem bij het afsluiten van het bestand %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Probleem bij het hernoemen van '%s' naar '%s'" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Probleem bij het ontlinken van het bestand %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Probleem bij het synchroniseren van het bestand" @@ -2920,17 +2921,22 @@ msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)" msgid "Retrieving file %li of %li" msgstr "Bestand %li van %li wordt opgehaald" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Het methodestuurprogramma %s kon niet gevonden worden." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Methode %s startte niet op de juiste manier" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3284,33 +3290,38 @@ msgstr "Kan geen authenticatierecord vinden voor: %s" msgid "Hash mismatch for: %s" msgstr "Hash-som komt niet overeen voor: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' voor '%s' is niet gevonden" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versie '%s' voor '%s' is niet gevonden" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Kon taak '%s' niet vinden" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Kon geen enkel pakket vinden bij regex '%s'" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Kon geen enkel pakket vinden bij regex '%s'" + +#: apt-pkg/cacheset.cc:616 #, fuzzy, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Kan geen versies selecteren voor pakket '%s' omdat deze zuiver virtueel is" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3319,21 +3330,21 @@ msgstr "" "Kan noch de geïnstalleerde, noch de kandidaat-versie van het pakket '%s' " "selecteren omdat deze geen van beide heeft" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Kan de nieuwste versie van het pakket '%s' niet selecteren omdat deze zuiver " "virtueel is" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Kan de kandidaat-versie van het pakket %s niet selecteren omdat deze geen " "kandidaat heeft" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/nn.po b/po/nn.po index 37c373e18..6061ad8ba 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -117,7 +117,7 @@ msgstr "Du m msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Finn ikkje pakken %s" @@ -703,7 +703,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -880,7 +881,7 @@ msgstr "Tidsavbrot p msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1065,15 +1066,15 @@ msgstr "Denne HTTP-tenaren har msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Intern feil" @@ -1568,33 +1569,33 @@ msgstr "Klarte ikkje endra namnet p msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Treff " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Hent:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Feil " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Henta %sB p %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Arbeider]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2557,22 +2558,22 @@ msgstr "lese, har framleis %lu att msgid "write, still have %llu to write but couldn't" msgstr "skrive, har framleis %lu att skrive, men klarte ikkje" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem ved synkronisering av fila" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problem ved oppheving av lenkje til fila" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Problem ved synkronisering av fila" @@ -2856,17 +2857,22 @@ msgstr "" msgid "Retrieving file %li of %li" msgstr "Les filliste" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Finn ikkje metodedrivaren %s." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, c-format +msgid "Is the package %s installed?" +msgstr "" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s starta ikkje rett" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3204,49 +3210,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Feil MD5-sum" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Fann ikkje utgva %s av %s" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Fann ikkje versjonen %s av %s" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Fann ikkje pakken %s" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Fann ikkje pakken %s" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Fann ikkje pakken %s" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/pl.po b/po/pl.po index 79e0a0470..91713a4ef 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -117,7 +117,7 @@ msgstr "Należy podać przynajmniej jeden wzorzec" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "To polecenie jest przestarzałe. Prosimy używać \"apt-mark showauto\"." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Nie udało się odnaleźć pakietu %s" @@ -749,7 +749,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -926,7 +927,7 @@ msgstr "Przekroczony czas połączenia gniazda danych" msgid "Unable to accept connection" msgstr "Nie udało się przyjąć połączenia" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Nie udało się obliczyć skrótu pliku" @@ -1115,15 +1116,15 @@ msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)" msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Błędne dane nagłówka" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Połączenie nie powiodło się" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Błąd wewnętrzny" @@ -1645,35 +1646,35 @@ msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" # Ujednolicono z aptitude -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Stary " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Pobieranie:" # Wyrównane do Hit i Err. -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign. " # Wyrównane do Hit i Ign. -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Błąd " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Pobrano %sB w %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Pracuje]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2654,22 +2655,22 @@ msgstr "należało przeczytać jeszcze %llu, ale nic nie zostało" msgid "write, still have %llu to write but couldn't" msgstr "należało zapisać jeszcze %llu, ale nie udało się to" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Problem przy zamykaniu pliku %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem przy zapisywaniu pliku %s w %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem przy odlinkowywaniu pliku %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Problem przy zapisywaniu pliku na dysk" @@ -2957,17 +2958,22 @@ msgstr "Pobieranie pliku %li z %li (pozostało %s)" msgid "Retrieving file %li of %li" msgstr "Pobieranie pliku %li z %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Nie udało się odnaleźć sterownika metody %s." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s nie uruchomiła się poprawnie" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Proszę włożyć do napędu \"%s\" dysk o nazwie: \"%s\" i nacisnąć enter." @@ -3311,35 +3317,41 @@ msgstr "Nie udało się znaleźć wpisu uwierzytelnienia dla: %s" msgid "Hash mismatch for: %s" msgstr "Błędna suma kontrolna dla: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Nie udało się odnaleźć zadania \"%s\"" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "" "Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\"" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "" +"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\"" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Nie udało się wybrać wersji z pakietu \"%s\", ponieważ jest on czysto " "wirtualny" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3348,21 +3360,21 @@ msgstr "" "Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", " "ponieważ nie ma żadnej z nich" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Nie udało się wybrać najnowszej wersji pakietu \"%s\", ponieważ jest on " "czysto wirtualny" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Nie udało się wybrać wersji kandydującej pakietu %s, ponieważ nie ma " "kandydata" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/pt.po b/po/pt.po index ce7d19cf7..0f22de44a 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -114,7 +114,7 @@ msgstr "" "Este comando foi depreceado. Em vez disso por favor utilize 'apt-mark " "showauto'." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Não foi possível encontrar o pacote %s" @@ -742,7 +742,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -917,7 +918,7 @@ msgstr "Ligação de socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" @@ -1107,15 +1108,15 @@ msgstr "Este servidor HTTP possui suporte de range errado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "A ligação falhou" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Erro interno" @@ -1619,33 +1620,33 @@ msgstr "Falha ao baixar %s %s\n" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Hit " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Obter:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Obtidos %sB em %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [A trabalhar]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2630,22 +2631,22 @@ msgstr "lidos, ainda restam %llu para serem lidos mas não resta nenhum" msgid "write, still have %llu to write but couldn't" msgstr "escritos, ainda restam %llu para escrever mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Problema ao fechar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema ao renomear o ficheiro %s para %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Problema ao remover o link do ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Problema sincronizando o ficheiro" @@ -2935,17 +2936,22 @@ msgstr "A obter o ficheiro %li de %li (%s restantes)" msgid "Retrieving file %li of %li" msgstr "A obter o ficheiro %li de %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "O driver do método %s não pôde ser encontrado." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Método %s não iniciou correctamente" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3305,33 +3311,38 @@ msgstr "Não foi possível encontrar registo de autenticação para: %s" msgid "Hash mismatch for: %s" msgstr "Hash não coincide para: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Não foi encontrado o Release '%s' para '%s'" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Não foi encontrada a versão '%s' para '%s'" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Não foi possível encontrar a tarefa '%s'" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Não foi possível seleccionar versões do pacote '%s' pois é puramente virtual" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3340,21 +3351,21 @@ msgstr "" "Não pode seleccionar a versão instalada nem a versão candidata do pacote " "'%s' pois não tem nenhuma destas" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Não foi possível seleccionar a versão mais recente a partir do pacote '%s' " "já que é puramente virtual" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Não é possível seleccionar a versão candidata do pacote %s já que não tem " "candidato" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 6d0e09792..7b426300b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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." @@ -113,7 +113,7 @@ msgstr "Você deve passar exatamente um padrão" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Impossível encontrar o pacote %s" @@ -713,7 +713,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -888,7 +889,7 @@ msgstr "Conexão do socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar conexão" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problema criando o hash do arquivo" @@ -1079,15 +1080,15 @@ msgstr "Este servidor HTTP possui suporte a \"range\" quebrado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Dados de cabeçalho ruins" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Conexão falhou" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Erro interno" @@ -1591,33 +1592,33 @@ msgstr "Falha ao baixar %s %s\n" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Atingido " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Obter:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Baixados %sB em %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Trabalhando]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2596,22 +2597,22 @@ msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado" msgid "write, still have %llu to write but couldn't" msgstr "escrita, ainda restam %lu para gravar mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problema fechando o arquivo" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema sincronizando o arquivo" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problema removendo o arquivo" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Problema sincronizando o arquivo" @@ -2900,17 +2901,22 @@ msgstr "Obtendo o arquivo %li de %li (%s restantes)" msgid "Retrieving file %li of %li" msgstr "Obtendo arquivo %li de %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "O driver do método %s não pode ser encontrado." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Método %s não iniciou corretamente" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3256,49 +3262,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Hash Sum incorreto" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' não foi encontrada" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versão '%s' para '%s' não foi encontrada" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Impossível achar tarefa %s" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Impossível achar pacote %s" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Impossível achar pacote %s" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/ro.po b/po/ro.po index a89a9131f..61dd8261a 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -115,7 +115,7 @@ msgstr "Trebuie să dați exact un șablon" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Nu s-a putut localiza pachetul %s" @@ -712,7 +712,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -889,7 +890,7 @@ msgstr "Timpul de conectare la socket-ul de date expirat" msgid "Unable to accept connection" msgstr "Nu s-a putut accepta conexiune" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problemă la calcularea dispersiei pentru fișierul" @@ -1081,15 +1082,15 @@ msgstr "Acest server HTTP are un suport defect de intervale" msgid "Unknown date format" msgstr "Format dată necunoscut" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Conectare eșuată" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Eroare internă" @@ -1597,33 +1598,33 @@ msgstr "Eșec la redenumirea lui %s în %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Atins " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Luat:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ignorat " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Eroare" -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Aduși: %sB în %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [În lucru]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2606,22 +2607,22 @@ msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic" msgid "write, still have %llu to write but couldn't" msgstr "scriere, încă mai am %lu de scris dar nu pot" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problemă la închiderea fișierului" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problemă în timpul sincronizării fișierului" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problemă la dezlegarea fișierului" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Problemă în timpul sincronizării fișierului" @@ -2904,17 +2905,22 @@ msgstr "Se descarcă fișierul %li din %li (%s rămas)" msgid "Retrieving file %li of %li" msgstr "Se descarcă fișierul %li din %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Metoda driver %s nu poate fi găsită." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s nu s-a lansat corect" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3262,49 +3268,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Nepotrivire la suma de căutare" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' pentru '%s' n-a fost găsită" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Nu s-a putut găsi sarcina %s" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nu pot găsi pachetul %s" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Nu pot găsi pachetul %s" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/ru.po b/po/ru.po index c4faf8f62..ed55c8c1a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt rev2227.1.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2012-06-30 08:47+0400\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -120,7 +120,7 @@ msgstr "Вы должны задать не менее одно шаблона msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Эта команда устарела. Используйте вместо неё «apt-mark showauto»." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Не удалось найти пакет %s" @@ -747,7 +747,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -926,7 +927,7 @@ msgstr "Время установления соединения для соке msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Проблема при хешировании файла" @@ -1114,15 +1115,15 @@ msgstr "Этот HTTP-сервер не поддерживает скачива msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Внутренняя ошибка" @@ -1641,33 +1642,33 @@ msgstr "Не удалось переименовать %s в %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "В кэше " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Получено:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Игн " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Ош " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Получено %sБ за %s (%sБ/c)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Обработка]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2655,22 +2656,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "ошибка при записи; собирались записать ещё %llu байт, но не смогли" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Проблема закрытия файла %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблема при переименовании файла %s в %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблема при удалении файла %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Проблема при синхронизации файла" @@ -2959,17 +2960,22 @@ msgstr "Скачивается файл %li из %li (осталось %s)" msgid "Retrieving file %li of %li" msgstr "Скачивается файл %li из %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Драйвер для метода %s не найден." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Метод %s запустился не корректно" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод." @@ -3319,33 +3325,38 @@ msgstr "Не удалось найти аутентификационную за msgid "Hash mismatch for: %s" msgstr "Не совпадает хеш сумма для: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Выпуск «%s» для «%s» не найден" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версия «%s» для «%s» не найдена" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Не удалось найти задачу «%s»" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Не удалось найти пакет по регулярному выражению «%s»" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Не удалось найти пакет по регулярному выражению «%s»" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Не удалось выбрать версии из пакета «%s», так как он полностью виртуальный" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3354,21 +3365,21 @@ msgstr "" "Не удалось выбрать ни установленную, ни версию кандидата из пакета «%s», так " "как в нём нет ни той, ни другой" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Не удалось выбрать самую новую версию из пакета «%s», так как он полностью " "виртуальный" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Не удалось выбрать самую версию кандидата из пакета %s, так как у него нет " "кандидатов" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/sk.po b/po/sk.po index 495b096d4..5741a6372 100644 --- a/po/sk.po +++ b/po/sk.po @@ -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: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -116,7 +116,7 @@ msgstr "" "Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark " "showauto“." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Nedá sa nájsť balík %s" @@ -733,7 +733,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -908,7 +909,7 @@ msgstr "Uplynulo spojenie dátového socketu" msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijať" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problém s hašovaním súboru" @@ -1094,15 +1095,15 @@ msgstr "Tento HTTP server má poškodenú podporu rozsahov" msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Vnútorná chyba" @@ -1615,33 +1616,33 @@ msgstr "Premenovanie %s na %s zlyhalo" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Už existuje " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Získava sa:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Chyba " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%sB sa stiahlo za %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Prebieha spracovanie]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2610,22 +2611,22 @@ msgstr "čítanie, treba prečítať ešte %llu, ale už nič neostáva" msgid "write, still have %llu to write but couldn't" msgstr "zápis, treba zapísať ešte %llu, no nedá sa to" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Problém pri zatváraní súboru %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problém pri synchronizovaní súboru %s na %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Problém pri odstraňovaní súboru %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Problém pri synchronizovaní súboru" @@ -2908,17 +2909,22 @@ msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)" msgid "Retrieving file %li of %li" msgstr "Sťahuje sa %li. súbor z %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Nedá sa nájsť ovládač spôsobu %s." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Spôsob %s nebol správne spustený" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlačte Enter." @@ -3262,32 +3268,37 @@ msgstr "Nebolo možné nájsť autentifikačný záznam pre: %s" msgid "Hash mismatch for: %s" msgstr "Nezhoda kontrolných haš súčtov: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nebolo nájdené vydanie „%s“ pre „%s“" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nebola nájdená verzia „%s“ pre „%s“" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Nebolo možné nájsť úlohu „%s“" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Nie je možné vybrať verzie z balíka „%s“, pretože je čisto virtuálny" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3296,20 +3307,20 @@ msgstr "" "Nie je možné vybrať nainštalované ani kandidátske verzie z balíka „%s“, " "pretože nemá žiadnu z nich" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Nie je možné vybrať najnovšiu verziu z balíka „%s“, pretože je čisto " "virtuálny" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Nie je možné vybrať kandidátsku verziu z balíka „%s“, pretože nemá kandidáta" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/sl.po b/po/sl.po index a0ee37460..108aedad2 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -114,7 +114,7 @@ msgstr "Podati morate vsaj en iskalni vzorec" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark showauto'." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Ni mogoče najti paketa %s" @@ -728,7 +728,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -903,7 +904,7 @@ msgstr "Povezava podatkovne vtičnice je zakasnela" msgid "Unable to accept connection" msgstr "Ni mogoče sprejeti povezave" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Težava med razprševanjem datoteke" @@ -1089,15 +1090,15 @@ msgstr "Ta strežnik HTTP ima pokvarjen obseg podpore" msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Napačni podatki glave" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Notranja napaka" @@ -1615,33 +1616,33 @@ msgstr "Ni mogoče preimenovati %s v %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Zadetek " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Dobi:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Prezr " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Nap " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Pridobljenih %sB v %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Delo]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2612,22 +2613,22 @@ msgstr "Prebrano, še vedno je treba prebrati %llu bajtov, vendar ni nič ostalo msgid "write, still have %llu to write but couldn't" msgstr "pisanje, preostalo je še %llu za pisanje, vendar ni bilo mogoče pisati" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Težava med zapiranjem datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Težava med preimenovanje datoteke %s v %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Težava med razvezovanjem datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Težava med usklajevanjem datoteke" @@ -2915,17 +2916,22 @@ msgstr "Pridobivanje datoteke %li od %li (%s preostalo)" msgid "Retrieving file %li of %li" msgstr "Pridobivanje datoteke %li od %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Gonilnika načinov %s ni mogoče najti." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Način %s se ni začel pravilno" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Vstavite disk z oznako '%s' v pogon '%s' in pritisnite vnosno tipko." @@ -3271,32 +3277,37 @@ msgstr "Ni mogoče najti zapisa overitve za: %s" msgid "Hash mismatch for: %s" msgstr "Neujemanje razpršila za: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Izdaje '%s' za '%s' ni mogoče najti" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Različice '%s' za '%s' ni mogoče najti" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Ni mogoče najti naloge '%s'" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Ni mogoče izbrati različic in paketa '%s', saj je popolnoma navidezen" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3305,19 +3316,19 @@ msgstr "" "Ni mogoče izbrati nameščene različice ali različice kandidata iz paketa " "'%s', saj nima nobenega od njiju" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Ni mogoče izbrati najnovejše različice iz paketa '%s', saj je popolnoma " "navidezen" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "Ni mogoče izbrati različice kandidata iz paketa %s, ker nima kandidata" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "Ni mogoče izbrati nameščene različice iz paketa %s, saj ni nameščen" diff --git a/po/sv.po b/po/sv.po index fda0cac14..c9b9daa1f 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2010-08-24 21:18+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n" @@ -114,7 +114,7 @@ msgstr "Du måste ange minst ett sökmönster" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Kunde inte hitta paketet %s" @@ -712,7 +712,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -887,7 +888,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen" msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutningen" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem med att lägga filen till hashtabellen" @@ -1081,15 +1082,15 @@ msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte" msgid "Unknown date format" msgstr "Okänt datumformat" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Felaktiga data i huvud" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Anslutningen misslyckades" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Internt fel" @@ -1599,36 +1600,36 @@ msgstr "" # Måste vara tre bokstäver(?) # "Hit" = aktuell version är fortfarande giltig -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Bra " # "Get:" = hämtar ny version -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Läs:" # "Ign" = hoppar över -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ign " # "Err" = fel vid hämtning -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Fel " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Hämtade %sB på %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Arbetar]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2607,22 +2608,22 @@ msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar" msgid "write, still have %llu to write but couldn't" msgstr "skrivning, har fortfarande %lu att skriva men kunde inte" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Problem med att stänga filen %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem med att byta namn på filen %s till %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem med att avlänka filen %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Problem med att synkronisera filen" @@ -2910,17 +2911,22 @@ msgstr "Hämtar fil %li av %li (%s återstår)" msgid "Retrieving file %li of %li" msgstr "Hämtar fil %li av %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Metoddrivrutinen %s kunde inte hittas." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s startade inte korrekt" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3262,33 +3268,38 @@ msgstr "Kan inte hitta autentiseringspost för: %s" msgid "Hash mismatch for: %s" msgstr "Hash-kontrollsumman stämmer inte för: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgåvan \"%s\" för \"%s\" hittades inte" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version \"%s\" för \"%s\" hittades inte" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Kunde inte hitta funktionen \"%s\"" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\"" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\"" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Kan inte välja versioner från paketet \"%s\" eftersom det är helt virtuellt" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3297,21 +3308,21 @@ msgstr "" "Kan inte välja installerad version eller kandidatversion från paketet \"%s\" " "eftersom det inte har någon av dem" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Kan inte välja senaste version från paketet \"%s\" eftersom det är helt " "virtuellt" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Kan inte välja kandidatversion från paketet %s eftersom det inte har någon " "kandidat" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/th.po b/po/th.po index 83ee7e98f..c28099bee 100644 --- a/po/th.po +++ b/po/th.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2012-10-27 22:44+0700\n" "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n" "Language-Team: Thai <thai-l10n@googlegroups.com>\n" @@ -112,7 +112,7 @@ msgstr "คุณต้องระบุแพตเทิร์นสำหร msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark showauto' แทน" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "ไม่พบแพกเกจ %s" @@ -715,7 +715,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -887,7 +888,7 @@ msgstr "หมดเวลารอเชื่อมต่อซ็อกเก msgid "Unable to accept connection" msgstr "ไม่สามารถรับการเชื่อมต่อ" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม" @@ -1071,15 +1072,15 @@ msgstr "การสนับสนุน Content-Range ที่เซิร์ msgid "Unknown date format" msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "ข้อมูลส่วนหัวผิดพลาด" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "เชื่อมต่อไม่สำเร็จ" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "ข้อผิดพลาดภายใน" @@ -1569,33 +1570,33 @@ msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไป msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "เจอ " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "ดึง:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "ข้าม " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "ปัญหา " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [กำลังทำงาน]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2552,22 +2553,22 @@ msgstr "read: ยังเหลือ %llu ที่ยังไม่ได้ msgid "write, still have %llu to write but couldn't" msgstr "write: ยังเหลือ %llu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "เกิดปัญหาขณะปิดแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "เกิดปัญหาขณะเปลี่ยนชื่อแฟ้ม %s ไปเป็น %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "เกิดปัญหาขณะลบแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "เกิดปัญหาขณะ sync แฟ้ม" @@ -2850,17 +2851,22 @@ msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จ msgid "Retrieving file %li of %li" msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "ไม่สามารถเรียกทำงานวิธีการ %s" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter" @@ -3196,32 +3202,37 @@ msgstr "ไม่พบระเบียนยืนยันความแท msgid "Hash mismatch for: %s" msgstr "แฮชไม่ตรงกันสำหรับ: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "ไม่พบรุ่น '%s' ของ '%s'" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "ไม่พบงานติดตั้ง '%s'" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "ไม่สามารถเลือกรุ่นต่างๆ ของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3229,17 +3240,17 @@ msgid "" msgstr "" "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้หรือรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีทั้งสองอย่าง" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "ไม่สามารถเลือกรุ่นใหม่ที่สุดของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "ไม่สามารถเลือกรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีรุ่นสำหรับติดตั้ง" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้ของแพกเกจ '%s' ได้ เนื่องจากแพกเกจไม่ได้ติดตั้งไว้" diff --git a/po/tl.po b/po/tl.po index a320e92fa..522742b9a 100644 --- a/po/tl.po +++ b/po/tl.po @@ -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: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -118,7 +118,7 @@ msgstr "Kailangan niyong magbigay ng isa lamang na pattern" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Hindi mahanap ang paketeng %s" @@ -709,7 +709,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -884,7 +885,7 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" @@ -1074,15 +1075,15 @@ msgstr "Sira ang range support ng HTTP server na ito" msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Maling datos sa panimula" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Internal na error" @@ -1580,33 +1581,33 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Tumama " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Kunin: " -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "DiPansin " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Err " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Nakakuha ng %sB ng %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [May ginagawa]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2588,22 +2589,22 @@ msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira" msgid "write, still have %llu to write but couldn't" msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problema sa pagsara ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema sa pag-sync ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problema sa pag-unlink ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Problema sa pag-sync ng talaksan" @@ -2889,17 +2890,22 @@ msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)" msgid "Retrieving file %li of %li" msgstr "Kinukuha ang talaksang %li ng %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Ang driver ng paraang %s ay hindi mahanap." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Hindi umandar ng tama ang paraang %s" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3244,49 +3250,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Di tugmang MD5Sum" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para sa '%s' ay hindi nahanap" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Hindi mahanap ang paketeng %s" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Hindi mahanap ang paketeng %s" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Hindi mahanap ang paketeng %s" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/tr.po b/po/tr.po index 0ea96fe86..f11eee943 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2013-02-18 03:41+0200\n" "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n" "Language-Team: Debian l10n Turkish\n" @@ -116,7 +116,7 @@ msgstr "" "Bu komutun kullanımı bırakılmıştır. Lütfen bunun yerine 'apt-mark showauto' " "komutunu kullanın." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "%s paketi bulunamadı" @@ -735,7 +735,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -910,7 +911,7 @@ msgstr "Veri soketi bağlantısı zaman aşımına uğradı" msgid "Unable to accept connection" msgstr "Bağlantı kabul edilemiyor" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Dosya sağlaması yapılamadı" @@ -1094,15 +1095,15 @@ msgstr "HTTP sunucusunun aralık desteği bozuk" msgid "Unknown date format" msgstr "Bilinmeyen tarih biçimi" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Kötü başlık verisi" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Bağlantı başarısız" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "İç hata" @@ -1612,33 +1613,33 @@ msgstr "%s, %s olarak yeniden adlandırılamadı" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Bağlandı " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Alınıyor: " -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Yoksay " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Hata " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "%2$s'de %1$sB alındı (%3$sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Çalışıyor]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2620,22 +2621,22 @@ msgstr "read, %llu bayt okunması gerekli fakat hiç kalmamış" msgid "write, still have %llu to write but couldn't" msgstr "write, yazılması gereken %llu bayt yazılamıyor" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "%s dosyası kapatılamadı" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s dosyası %s olarak yeniden adlandırılamadı" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "%s dosyasından bağ kaldırma sorunu" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Dosya eşitlenirken sorun çıktı" @@ -2932,17 +2933,22 @@ msgstr "Alınan dosya: %li / %li (%s kaldı)" msgid "Retrieving file %li of %li" msgstr "Alınan dosya: %li / %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Yöntem sürücüsü %s bulunamadı." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "'dpkg-dev' paketinin kurulu olduğundan emin olun.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "%s yöntemi düzgün şekilde başlamadı" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3288,32 +3294,37 @@ msgstr "%s için kimlik doğrulama kaydı bulunamadı." msgid "Hash mismatch for: %s" msgstr "Sağlama yapılamadı: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "'%s' görevi bulunamadı" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "'%s' paketi tamamen sanal olduğu için sürümü seçilemiyor" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3322,17 +3333,17 @@ msgstr "" "'%s' paketi kurulu olmadığı ve aday sürüme sahip olmadığı için her ikisi de " "seçilemiyor" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "'%s' paketi sanal olduğu için en yeni sürümü seçilemiyor" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "'%s' paketinin aday sürümü olmadığı için aday sürüm seçilemiyor" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "'%s' paketi kurulu olmadığı için kurulu sürüm seçilemiyor" diff --git a/po/uk.po b/po/uk.po index c089d5fac..080d76fd2 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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" @@ -121,7 +121,7 @@ msgstr "Ви повинні задати не менше одного шабло msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Ця команда є застарілою. Будь-ласка використовуйте 'apt-mark showauto'" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Не можу знайти пакунок %s" @@ -745,7 +745,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -922,7 +923,7 @@ msgstr "Час з'єднання з сокетом даних вичерпавс msgid "Unable to accept connection" msgstr "Неможливо прийняти з'єднання" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Проблема хешування файла" @@ -1110,15 +1111,15 @@ msgstr "Цей HTTP сервер має поламану підтримку 'ran msgid "Unknown date format" msgstr "Невідомий формат дати" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Погана заголовкова інформація" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "З'єднання не вдалося" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Внутрішня помилка" @@ -1633,33 +1634,33 @@ msgstr "Не вдалося перейменувати %s на %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "В кеші " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Отр:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Ігн " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Пом " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Отримано %sB за %sB (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Йде робота]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2655,22 +2656,22 @@ msgstr "зчитування, повинен зчитати ще %llu байт, msgid "write, still have %llu to write but couldn't" msgstr "записування, повинен був записати ще %llu байт, але не вдалося" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Проблема з закриттям файла %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблема з перейменуванням файла %s на %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблема з роз'єднанням файла %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Проблема з синхронізацією файла" @@ -2956,17 +2957,22 @@ msgstr "Завантажується файл %li з %li (залишилось % msgid "Retrieving file %li of %li" msgstr "Завантажується файл %li з %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Драйвер для метода %s не знайдено." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Метод %s стартував некоректно" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -3311,32 +3317,37 @@ msgstr "Неможливо знайти аутентифікаційний за msgid "Hash mismatch for: %s" msgstr "Невідповідність хешу для: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Випуск '%s' для '%s' не знайдено" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версія '%s' для '%s' не знайдена" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Неможливо знайти завдання '%s'" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Неможливо вибирати версії пакунку '%s', так як він є чисто віртуальним" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3345,19 +3356,19 @@ msgstr "" "Неможливо вибрати встановлений пакунок, або версію-кандидат пакунку '%s', " "так як вони відсутні" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Неможливо вибрати найновішу версію пакунку '%s', так як він є чисто " "віртуальним" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "Неможливо вибрати версію пакунку %s, так як він не має кандидатів" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/vi.po b/po/vi.po index a4941fe3f..ab7e05732 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.15.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2014-02-10 07:50+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -117,7 +117,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Lệnh này đã lỗi thời. Xin hãy dùng lệnh “apt-mark showauto” để thay thế." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Không thể xác định vị trí của gói %s" @@ -743,6 +743,7 @@ msgstr "" " apt-mark(8) và apt.conf(5)" #: cmdline/apt.cc:71 +#, fuzzy msgid "" "Usage: apt [options] command\n" "\n" @@ -758,7 +759,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -951,7 +953,7 @@ msgstr "Quá giờ kết nối ổ cắm dữ liệu" msgid "Unable to accept connection" msgstr "Không thể chấp nhận kết nối" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Gặp vấn đề băm tập tin" @@ -1143,15 +1145,15 @@ msgstr "Máy phục vụ HTTP không hỗ trợ tải một phần tập tin" msgid "Unknown date format" msgstr "Không rõ định dạng ngày" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "Dữ liệu phần đầu sai" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Kết nối bị lỗi" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "Gặp lỗi nội bộ" @@ -1644,33 +1646,33 @@ msgstr "Gặp lỗi khi phân tích %s. Sửa lại chứ? " msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "Tập tin “%s” của bạn đã thay đổi, hãy chạy lệnh “apt-get update”." -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "Tìm thấy " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "Lấy:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "Bỏq " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "Lỗi " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Đã lấy về %sB mất %s (%sB/g).\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [Đang hoạt động]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2665,22 +2667,22 @@ msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả msgid "write, still have %llu to write but couldn't" msgstr "ghi, còn cần ghi %llu nhưng mà không thể" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "Gặp vấn đề khi đóng tập tin %s" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Gặp vấn đề khi đổi tên tập tin %s thành %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Gặp vấn đề khi đồng bộ hóa tập tin" @@ -2972,17 +2974,22 @@ msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)" msgid "Retrieving file %li of %li" msgstr "Đang tải tập tin %li trong tổng số %li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Không tìm thấy trình điều khiển phương thức %s." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Hãy kiểm tra xem gói “dpkg-dev” đã được cài đặt chưa.\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Phương thức %s đã không khởi chạy đúng đắn." -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Hãy cho đĩa có nhãn “%s” vào ổ “%s” rồi bấm nút Enter." @@ -3334,32 +3341,37 @@ msgstr "Không tìm thấy bản ghi xác thực cho: %s" msgid "Hash mismatch for: %s" msgstr "Sai khớp chuỗi duy nhất cho: %s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Không tìm thấy bản phát hành “%s” cho “%s”" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Không tìm thấy phiên bản “%s” cho “%s”" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "Không tìm thấy tác vụ “%s”" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Không tìm thấy gói nào theo biểu thức chính quy “%s”" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Không tìm thấy gói nào theo biểu thức chính quy “%s”" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Không thể chọn phiên bản trong gói “%s” vì nó chỉ là ảo" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3368,17 +3380,17 @@ msgstr "" "Không thể chọn phiên bản được cài đặt hoặc phiên bản ứng cử trong gói “%s” " "mà không có trong nó" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "Không thể chọn phiên bản mới nhất trong gói “%s” vì nó chỉ là ảo" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "Không thể chọn phiên bản ứng cử trong gói %s vì nó không có ứng cử" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 7a97e6305..df90ae0a4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -113,7 +113,7 @@ msgstr "您必须明确地给出至少一个表达式" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "未发现软件包 %s" @@ -701,7 +701,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -875,7 +876,7 @@ msgstr "数据套接字连接超时" msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "把文件加入哈希表时出错" @@ -1059,15 +1060,15 @@ msgstr "该 HTTP 服务器的 range 支持不正常" msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "连接失败" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "内部错误" @@ -1553,33 +1554,33 @@ msgstr "无法将 %s 重命名为 %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "命中 " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "获取：" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "忽略 " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "错误 " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "下载 %sB，耗时 %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [执行中]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2540,22 +2541,22 @@ msgstr "读取文件出错，还剩 %lu 字节没有读出" msgid "write, still have %llu to write but couldn't" msgstr "写入文件出错，还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, c-format msgid "Problem closing the file %s" msgstr "关闭文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, c-format msgid "Problem renaming the file %s to %s" msgstr "重命名文件 %s 为 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, c-format msgid "Problem unlinking the file %s" msgstr "用 unlink 删除文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "同步文件出错" @@ -2840,17 +2841,22 @@ msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)" msgid "Retrieving file %li of %li" msgstr "正在下载第 %li 个文件，共 %li 个" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "请检查是否安装了“dpkg-dev”软件包。\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。" @@ -3185,49 +3191,54 @@ msgstr "无法找到认证记录：%s" msgid "Hash mismatch for: %s" msgstr "Hash 校验和不符：%s" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”发布版本" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, c-format msgid "Couldn't find task '%s'" msgstr "无法找到任务 %s" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "无法按照正则表达式 %s 找到任何软件包" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "无法按照正则表达式 %s 找到任何软件包" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "无法从完全虚拟的软件包 %s 中选择版本" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "因为软件包 %s 没有候选版本，无法进行选择" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本" diff --git a/po/zh_TW.po b/po/zh_TW.po index 09bdf0760..5e8a357da 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-02-13 10:19+0100\n" +"POT-Creation-Date: 2014-02-20 14:43+0100\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." @@ -114,7 +114,7 @@ msgstr "您必須明確得給定一個樣式" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "找不到套件 %s" @@ -694,7 +694,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -867,7 +868,7 @@ msgstr "Data socket 連線逾時" msgid "Unable to accept connection" msgstr "無法接受連線" -#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "有問題的雜湊檔" @@ -1052,15 +1053,15 @@ msgstr "這個 HTTP 伺服器的範圍支援有問題" msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/server.cc:490 +#: methods/server.cc:494 msgid "Bad header data" msgstr "錯誤的標頭資料" -#: methods/server.cc:507 methods/server.cc:563 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "連線失敗" -#: methods/server.cc:655 +#: methods/server.cc:659 msgid "Internal error" msgstr "內部錯誤" @@ -1551,33 +1552,33 @@ msgstr "無法將 %s 更名為 %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/acqprogress.cc:63 msgid "Hit " msgstr "已有 " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:87 msgid "Get:" msgstr "下載:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:118 msgid "Ign " msgstr "略過 " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:122 msgid "Err " msgstr "錯誤 " -#: apt-private/acqprogress.cc:140 +#: apt-private/acqprogress.cc:143 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "取得 %sB 用了 %s (%sB/s)\n" -#: apt-private/acqprogress.cc:230 +#: apt-private/acqprogress.cc:233 #, c-format msgid " [Working]" msgstr " [工作中]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:294 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -2540,22 +2541,22 @@ msgstr "讀取，仍有 %lu 未讀但已無空間" msgid "write, still have %llu to write but couldn't" msgstr "寫入，仍有 %lu 待寫入但已沒辨法" -#: apt-pkg/contrib/fileutl.cc:1732 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "在關閉檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:1744 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "在同步檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "在刪除檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:1768 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "在同步檔案時發生問題" @@ -2835,17 +2836,22 @@ msgstr "正在取得檔案 %li/%li（還有 %s）" msgid "Retrieving file %li of %li" msgstr "正在取得檔案 %li/%li" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "找不到安裝方式的驅動程式 %s。" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "安裝方式 %s 沒有正確啟動" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。" @@ -3175,49 +3181,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Hash Sum 不符" -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "找不到 '%2$s' 的 '%1$s' 發行版" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "找不到 '%s' 版的 '%s'" -#: apt-pkg/cacheset.cc:583 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "無法找到主題 %s" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "無法找到套件 %s" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "無法找到套件 %s" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:637 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -- cgit v1.2.3